gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r1729 - GNUnet/po


From: grothoff
Subject: [GNUnet-SVN] r1729 - GNUnet/po
Date: Wed, 17 Aug 2005 20:59:10 -0700 (PDT)

Author: grothoff
Date: 2005-08-17 20:59:07 -0700 (Wed, 17 Aug 2005)
New Revision: 1729

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

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2005-08-18 03:56:29 UTC (rev 1728)
+++ GNUnet/po/GNUnet.pot        2005-08-18 03:59:07 UTC (rev 1729)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-18 01:09+0200\n"
+"POT-Creation-Date: 2005-08-17 21:04-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"
@@ -68,7 +68,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:726
-#: src/applications/session/connect.c:735
+#: src/applications/session/connect.c:749
 #, c-format
 msgid "'%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -82,49 +82,49 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:79
+#: src/applications/bootstrap_http/http.c:81
 #: src/applications/testbed/testbed.c:1080
 #, c-format
 msgid "Invalid URL '%s' (must begin with '%s')\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:107
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
 msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:118
+#: src/applications/bootstrap_http/http.c:120
 #, c-format
 msgid "'%s' failed at %s:%d with error: '%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:131
+#: src/applications/bootstrap_http/http.c:133
 #, c-format
 msgid "Could not download list of peer contacts, host '%s' unknown.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:153
-#: src/applications/bootstrap_http/http.c:179
+#: 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/applications/bootstrap_http/http.c:215
+#: src/applications/bootstrap_http/http.c:217
 #, c-format
 msgid "Parsing HTTP response for URL '%s' failed.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:250
+#: src/applications/bootstrap_http/http.c:252
 #, c-format
 msgid "Parsing hello from '%s' failed.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:326
+#: 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/applications/bootstrap_http/http.c:350
+#: src/applications/bootstrap_http/http.c:354
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -177,9 +177,10 @@
 #: src/applications/template/gnunet-template.c:87
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:542
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/server/gnunet-peer-info.c:107 src/server/gnunet-transport-check.c:512
-#: src/server/gnunet-update.c:129 src/server/startup.c:512
+#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:117
+#: src/conf/gnunet-setup.c:255 src/server/gnunet-peer-info.c:107
+#: src/server/gnunet-transport-check.c:512 src/server/gnunet-update.c:129
+#: src/server/startup.c:516
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
@@ -497,7 +498,7 @@
 #: src/applications/dht/tools/dhttest2.c:127
 #: src/applications/gap/gaptest.c:317
 #: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:200
+#: src/applications/tbench/tbenchtest.c:199
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr ""
@@ -510,30 +511,40 @@
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:556
+#: src/applications/fragmentation/fragmentation.c:549
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:550
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:551
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:561
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:889
+#: src/applications/fs/ecrs/download.c:121
+#, c-format
+msgid "Could not unlink temporary file '%s': %s\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/download.c:249
+#, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/download.c:893
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1054
+#: src/applications/fs/ecrs/download.c:1062
 #, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr ""
@@ -579,45 +590,50 @@
 msgid "Format of file '%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:158
+#: src/applications/fs/ecrs/search.c:160
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:210
+#: src/applications/fs/ecrs/search.c:216
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:182
+#: src/applications/fs/ecrs/upload.c:175
 #, c-format
+msgid "'%s' is not a file.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:192
+#, c-format
 msgid "Cannot hash '%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file '%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
 #, c-format
 msgid ""
 "Indexing file '%s' failed. Check file permissions and consult your GNUnet "
 "server's logs.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:289
+#: src/applications/fs/ecrs/upload.c:301
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:239
+#: src/applications/fs/fsui/download.c:240
 msgid "Download aborted."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:242
+#: src/applications/fs/fsui/download.c:243
 msgid "ECRS download failed (see logs)."
 msgstr ""
 
-#: src/applications/fs/fsui/downloadtest.c:185
+#: 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
@@ -625,15 +641,15 @@
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:73
+#: src/applications/fs/fsui/file_info.c:76
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:162
+#: src/applications/fs/fsui/fsui.c:168
 msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:597
+#: src/applications/fs/fsui/fsui.c:616
 #, c-format
 msgid "FSUI state file '%s' had syntax error at offset %u.\n"
 msgstr ""
@@ -652,7 +668,7 @@
 "schedule.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:164
+#: src/applications/fs/fsui/search.c:196
 msgid "This search is already pending!\n"
 msgstr ""
 
@@ -660,27 +676,27 @@
 msgid "Unindex failed.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:404
+#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:402
 msgid "Upload failed.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:407
 msgid "Cannot upload directory without using recursion.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:961
+#: src/applications/fs/module/fs.c:988
 #, c-format
 msgid ""
 "You must specify a postive number for '%s' in the configuration in section '%"
 "s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1002
+#: src/applications/fs/module/fs.c:1029
 #, c-format
 msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1039
+#: src/applications/fs/module/fs.c:1066
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -717,7 +733,7 @@
 "Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1904
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
@@ -1096,7 +1112,8 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:223
-#: src/server/gnunet-peer-info.c:118 src/server/gnunet-transport-check.c:523
+#: src/conf/gnunet-setup.c:184 src/server/gnunet-peer-info.c:118
+#: src/server/gnunet-transport-check.c:523
 msgid "Invalid arguments. Exiting.\n"
 msgstr ""
 
@@ -1225,23 +1242,23 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1893
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
-#: src/applications/gap/gap.c:1897
+#: src/applications/gap/gap.c:1910 src/applications/gap/gap.c:1915
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2113
+#: src/applications/gap/gap.c:2152
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2144
+#: src/applications/gap/gap.c:2183
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr ""
@@ -1256,7 +1273,7 @@
 msgstr ""
 
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:976
+#: src/applications/identity/identity.c:1024
 #, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
@@ -1281,19 +1298,19 @@
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:330
+#: src/applications/identity/identity.c:324
 #, c-format
 msgid ""
 "File '%s' in directory '%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:363
+#: src/applications/identity/identity.c:357
 #, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:614
-#: src/applications/identity/identity.c:632
+#: src/applications/identity/identity.c:637
+#: src/applications/identity/identity.c:655
 #, c-format
 msgid "Removed file '%s' containing invalid hello data.\n"
 msgstr ""
@@ -1416,108 +1433,109 @@
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:208
+#: 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:245
+#: src/applications/session/connect.c:246
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:518
+#: src/applications/session/connect.c:520
 #, c-format
 msgid "Invalid '%s' message received from peer '%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:526
+#: src/applications/session/connect.c:529
 #, c-format
-msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
+msgid "setkey '%s' from '%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:578
+#: src/applications/session/connect.c:584
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:725
+#: src/applications/session/connect.c:739
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:727
+#: src/applications/session/connect.c:741
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:729
+#: src/applications/session/connect.c:743
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:745
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:159
-#: src/applications/sqstore_mysql/mysql.c:348
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:835
-#: src/applications/sqstore_mysql/mysql.c:914
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
+#: src/applications/sqstore_mysql/mysql.c:149
+#: src/applications/sqstore_mysql/mysql.c:156
+#: src/applications/sqstore_mysql/mysql.c:362
+#: src/applications/sqstore_mysql/mysql.c:689
+#: src/applications/sqstore_mysql/mysql.c:704
+#: src/applications/sqstore_mysql/mysql.c:713
+#: src/applications/sqstore_mysql/mysql.c:737
+#: src/applications/sqstore_mysql/mysql.c:747
+#: src/applications/sqstore_mysql/mysql.c:796
+#: src/applications/sqstore_mysql/mysql.c:875
+#: src/applications/sqstore_mysql/mysql.c:885
+#: src/applications/sqstore_mysql/mysql.c:955
+#: src/applications/sqstore_mysql/mysql.c:964
+#: src/applications/sqstore_sqlite/sqlite.c:43
+#: src/applications/sqstore_sqlite/sqlite.c:50 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
-#: src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1025 src/include/gnunet_util.h:1032
+#: src/include/gnunet_util.h:1034
 #, c-format
 msgid "'%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:462
-#: src/applications/sqstore_mysql/mysql.c:547
-#: src/applications/sqstore_mysql/mysql.c:647
-#: src/applications/sqstore_mysql/mysql.c:802
-#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:505
+#: src/applications/sqstore_mysql/mysql.c:602
+#: src/applications/sqstore_mysql/mysql.c:763
+#: src/applications/sqstore_mysql/mysql.c:777
 msgid "Invalid data in MySQL database.  Please verify integrity!\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1108
+#: src/applications/sqstore_mysql/mysql.c:1065
 #, c-format
 msgid "Query '%s' had no results.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1199
+#: src/applications/sqstore_mysql/mysql.c:1156
 #, c-format
 msgid "Trying to use file '%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysqltest.c:257
-#: src/applications/sqstore_sqlite/sqlitetest.c:259
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/sqstore_sqlite/sqlitetest.c:258
 msgid "Could not initialize libgnunetutil!\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:181
-#: src/applications/sqstore_sqlite/sqlite.c:201
+#: src/applications/sqstore_sqlite/sqlite.c:197
+#: src/applications/sqstore_sqlite/sqlite.c:217
 msgid "SQL Database corrupt, ignoring result.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:406
-#: src/applications/sqstore_sqlite/sqlite.c:601
+#: src/applications/sqstore_sqlite/sqlite.c:428
+#: src/applications/sqstore_sqlite/sqlite.c:621
 msgid "Invalid data in database.  Please verify integrity!\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:915
+#: src/applications/sqstore_sqlite/sqlite.c:979
 #, c-format
 msgid ""
 "Configuration file must specify directory for storing FS data in section '%"
 "s' under '%s'.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:929
+#: src/applications/sqstore_sqlite/sqlite.c:993
 msgid "Unable to initialize SQLite.\n"
 msgstr ""
 
@@ -1685,7 +1703,7 @@
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:447
+#: src/applications/tbench/tbench.c:448
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1711,7 +1729,7 @@
 "Failed to receive reply from gnunetd.\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:212
+#: src/applications/tbench/tbenchtest.c:211
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -1908,7 +1926,7 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:388
+#: src/applications/topology_default/topology.c:400
 #, c-format
 msgid "Version mismatch ('%s' vs. '%*.s'), run gnunet-update!\n"
 msgstr ""
@@ -2026,43 +2044,49 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/transport/transport.c:469
-#: src/applications/transport/transport.c:477
+#: src/applications/transport/transport.c:471
+#: src/applications/transport/transport.c:479
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:635
+#: src/applications/transport/transport.c:639
 #, c-format
 msgid "Option '%s' not set in configuration in section '%s', setting to %dm.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:654
 #, c-format
 msgid ""
 "You should specify at least one transport service under option '%s' in "
 "section '%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:680
 #, c-format
 msgid "Transport library '%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:697
+#: src/applications/transport/transport.c:701
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr ""
 
-#: src/conf/recreate.c:71
+#: src/conf/conf.c:522 src/conf/recreate.c:100
 #, c-format
-msgid "Unable to save configuration files: %s.\n"
+msgid "Unable to save configuration file '%s': %s.\n"
 msgstr ""
 
-#: src/conf/recreate.c:75
-msgid "Configuration files (re)created.\n"
+#: src/conf/conf.c:529
+#, c-format
+msgid "Configuration file '%s' created.\n"
 msgstr ""
 
+#: src/conf/confdata.c:93
+#, c-format
+msgid "%s: symbol value '%s' invalid for %s\n"
+msgstr ""
+
 #: src/conf/gconf_interface.c:135
 msgid "Gtk GNUnet Configurator"
 msgstr ""
@@ -2220,94 +2244,159 @@
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:33
+#: src/conf/gnunet-setup.c:93
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:101
+msgid "Tool to setup GNUnet."
+msgstr ""
+
+#: src/conf/gnunet-setup.c:102
+#, c-format
+msgid "Available MODEs:\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:103
+#, c-format
+msgid " config\t\ttext-based configuration\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:105
+#, c-format
+msgid " menuconfig\ttext-based menu\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:107
+#, c-format
+msgid " wizard-curses\tBasic text-based graphical configuration\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:110
+#, c-format
+msgid " gconfig\tGTK configuration\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:111
+#, c-format
 msgid ""
-"USAGE: gnunet-setup MODULE\n"
-"\n"
-"MODULE\n"
-" recreate\trecreate configuration files\n"
-" config\t\ttext-based configuration\n"
-" menuconfig\ttext-based menu\n"
-" gconfig\tGTK configuration\n"
-" wizard-curses\tBasic text-based graphical configuration\n"
 " wizard-gtk\tBasic GTK configuration\n"
 "\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:97
-msgid "Please specify a path where the configuration files will be stored."
+#: src/conf/gnunet-setup.c:172
+#, c-format
+msgid "gnunet-setup must have write-access to the configuration file '%s'\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:108
+#: src/conf/gnunet-setup.c:181 src/server/gnunet-peer-info.c:113
+#: src/server/gnunet-transport-check.c:518 src/server/gnunet-update.c:139
 #, c-format
+msgid "Invalid arguments: "
+msgstr ""
+
+#: src/conf/gnunet-setup.c:223
+#, c-format
+msgid "menuconfig is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:228 src/conf/gnunet-setup.c:238
+#, c-format
+msgid ""
+"Can only run wizard to configure gnunetd.\n"
+"Did you forget the '%s' option?\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:233
+#, c-format
+msgid "wizard-curses is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:243
+#, c-format
+msgid "wizard-gtk is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:250
+#, c-format
+msgid "gconfig is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:254
+#, c-format
+msgid "Unknown operation '%s'\n"
+msgstr ""
+
+#: src/conf/gnunet-win-tool.c:109
+#, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:111 src/conf/gnunet-win-tool.c:138
+#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:115 src/conf/gnunet-win-tool.c:142
+#: 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"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:120
+#: src/conf/gnunet-win-tool.c:121
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:123 src/conf/gnunet-win-tool.c:154
+#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:135
+#: src/conf/gnunet-win-tool.c:136
 #, c-format
 msgid "Service deleted.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:147
+#: src/conf/gnunet-win-tool.c:148
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:151
+#: src/conf/gnunet-win-tool.c:152
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/conf/wizard_callbacks.c:213
+#: src/conf/wizard_callbacks.c:169
 #, c-format
-msgid "Unable to save configuration file %s:"
+msgid "Unable to save configuration file '%s':"
 msgstr ""
 
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
+#: src/conf/wizard_callbacks.c:189 src/conf/wizard_curs.c:613
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
+#: src/conf/wizard_callbacks.c:196 src/conf/wizard_curs.c:616
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
+#: src/conf/wizard_curs.c:57 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:120 src/conf/wizard_util.c:162
 msgid "Error"
 msgstr ""
 
-#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
-#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
-#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
-#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
-#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
-#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
-#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
+#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:128
+#: src/conf/wizard_curs.c:181 src/conf/wizard_curs.c:218
+#: src/conf/wizard_curs.c:248 src/conf/wizard_curs.c:274
+#: src/conf/wizard_curs.c:307 src/conf/wizard_curs.c:334
+#: src/conf/wizard_curs.c:366 src/conf/wizard_curs.c:391
+#: src/conf/wizard_curs.c:420 src/conf/wizard_curs.c:443
+#: src/conf/wizard_curs.c:498 src/conf/wizard_curs.c:560
+#: src/conf/wizard_curs.c:591 src/conf/wizard_curs.c:635
 msgid "GNUnet configuration"
 msgstr ""
 
-#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:114
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -2315,48 +2404,48 @@
 "GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
-"\thttp://www.gnunet.org\n";
+"\thttp://gnunet.org/\n";
 "and join our community at\n"
-"\thttp://www.gnunet.org/drupal/\n";
+"\thttp://gnunet.org/drupal/\n";
 "\n"
 "Have a lot of fun,\n"
 "\n"
 "the GNUnet team"
 msgstr ""
 
-#: src/conf/wizard_curs.c:115
+#: src/conf/wizard_curs.c:129
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
-#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:188
+#: src/conf/wizard_curs.c:225 src/conf/wizard_curs.c:280
+#: src/conf/wizard_curs.c:312 src/conf/wizard_curs.c:372
 msgid "Help"
 msgstr ""
 
-#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:189
 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:167
+#: src/conf/wizard_curs.c:182
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:219
 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:208
+#: src/conf/wizard_curs.c:226
 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 "
@@ -2367,7 +2456,7 @@
 "IP-Address."
 msgstr ""
 
-#: src/conf/wizard_curs.c:230
+#: src/conf/wizard_curs.c:249
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -2378,11 +2467,11 @@
 "forwarding\")."
 msgstr ""
 
-#: src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:275
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:280
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2393,11 +2482,11 @@
 "connection."
 msgstr ""
 
-#: src/conf/wizard_curs.c:287
+#: src/conf/wizard_curs.c:307
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:292
+#: src/conf/wizard_curs.c:313
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2408,7 +2497,7 @@
 "connection."
 msgstr ""
 
-#: src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:335
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -2421,18 +2510,18 @@
 "connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/conf/wizard_curs.c:344
+#: src/conf/wizard_curs.c:367
 msgid "How much CPU (in %) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:373
 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/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:392
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -2445,7 +2534,7 @@
 "availability."
 msgstr ""
 
-#: src/conf/wizard_curs.c:395
+#: src/conf/wizard_curs.c:421
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -2453,7 +2542,7 @@
 "inserted and migrated content)."
 msgstr ""
 
-#: src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:444
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -2462,7 +2551,7 @@
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/conf/wizard_curs.c:440
+#: src/conf/wizard_curs.c:499
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -2478,7 +2567,7 @@
 "GNUnet user:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:468
+#: src/conf/wizard_curs.c:561
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -2493,7 +2582,7 @@
 "GNUnet group:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:497
+#: src/conf/wizard_curs.c:592
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -2501,7 +2590,7 @@
 "Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:576
+#: src/conf/wizard_curs.c:629
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -2515,6 +2604,23 @@
 msgid "GNUnet configuration assistant"
 msgstr ""
 
+#: src/conf/wizard_interface.c:77
+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://www.gnunet.org\n";
+"and join our community at\n"
+"\thttp://www.gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
+msgstr ""
+
 #: src/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
 #: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
 msgid "Next"
@@ -2726,31 +2832,31 @@
 msgid "Can't access the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:111
+#: src/conf/wizard_util.c:112
 msgid "Can't delete the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:114
+#: src/conf/wizard_util.c:116
 msgid "Unknown error"
 msgstr ""
 
-#: src/conf/wizard_util.c:143
+#: src/conf/wizard_util.c:145
 msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:149
 msgid "Error creating user"
 msgstr ""
 
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:152
 msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:155
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/conf/wizard_util.c:156
+#: src/conf/wizard_util.c:158
 msgid "Unknown error while creating a new user"
 msgstr ""
 
@@ -2764,41 +2870,41 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2155
+#: src/server/connection.c:2192
 #, c-format
 msgid "Message from '%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2232
+#: src/server/connection.c:2269
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2248
+#: src/server/connection.c:2285
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2641
+#: src/server/connection.c:2679
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2643
+#: src/server/connection.c:2681
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2645
+#: src/server/connection.c:2683
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2647
+#: src/server/connection.c:2685
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:2649
+#: src/server/connection.c:2687
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:2651
+#: src/server/connection.c:2689
 msgid "# bytes noise sent"
 msgstr ""
 
@@ -2859,12 +2965,6 @@
 msgid "Print information about GNUnet peers."
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:113 src/server/gnunet-transport-check.c:518
-#: src/server/gnunet-update.c:139
-#, c-format
-msgid "Invalid arguments: "
-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"
@@ -3020,27 +3120,27 @@
 msgid "Updated data for %d applications.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:108
+#: src/server/gnunetd.c:115
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run '%s'!\n"
 msgstr ""
 
-#: src/server/gnunetd.c:116
+#: src/server/gnunetd.c:123
 #, c-format
 msgid "'%s' starting\n"
 msgstr ""
 
-#: src/server/gnunetd.c:138
+#: src/server/gnunetd.c:145
 #, c-format
 msgid "'%s' startup complete.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:143
+#: src/server/gnunetd.c:150
 #, c-format
 msgid "'%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/handler.c:366
+#: src/server/handler.c:367
 #, c-format
 msgid "Received corrupt message from peer '%s'in %s:%d.\n"
 msgstr ""
@@ -3074,26 +3174,26 @@
 msgid "Starts the gnunetd daemon."
 msgstr ""
 
-#: src/server/startup.c:488
+#: src/server/startup.c:412
 #, c-format
-msgid "User '%s' not known, cannot change UID to it."
+msgid "User '%s' not known, cannot change UID to it.\n"
 msgstr ""
 
-#: src/server/startup.c:499
+#: src/server/startup.c:421
 #, c-format
-msgid "Cannot change user/group to '%s': %s"
+msgid "Cannot change user/group to '%s': %s\n"
 msgstr ""
 
-#: src/server/startup.c:518
+#: src/server/startup.c:522
 msgid "Invalid command-line arguments:\n"
 msgstr ""
 
-#: src/server/startup.c:521
+#: src/server/startup.c:525
 #, c-format
 msgid "Argument %d: '%s'\n"
 msgstr ""
 
-#: src/server/startup.c:527
+#: src/server/startup.c:531
 msgid "Invalid command-line arguments.\n"
 msgstr ""
 
@@ -3109,7 +3209,7 @@
 "entry '%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:802
+#: src/server/tcpserver.c:806
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
@@ -3132,7 +3232,7 @@
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 
-#: src/transports/http.c:817 src/transports/tcp.c:689 src/transports/udp.c:286
+#: src/transports/http.c:817 src/transports/tcp.c:692 src/transports/udp.c:286
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
@@ -3141,7 +3241,7 @@
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1132 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -3223,24 +3323,24 @@
 "Received malformed message (size %u) from tcp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1057
+#: src/transports/tcp.c:1064
 msgid "Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:1314 src/transports/tcp6.c:1200
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1424
+#: src/transports/tcp.c:1431
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:1426
+#: src/transports/tcp.c:1433
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:1428
+#: src/transports/tcp.c:1435
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
@@ -3381,16 +3481,14 @@
 msgid "Syntax error in configuration file '%s' at line %d.\n"
 msgstr ""
 
-#: src/util/configuration.c:471
+#: src/util/configuration.c:509 src/util/configuration.c:511
 #, c-format
-msgid ""
-"Configuration file '%s' not found. I will try to create the default "
-"configuration file at that location.\n"
+msgid "Configuration file '%s' not found.  Run gnunet-setup!\n"
 msgstr ""
 
-#: src/util/configuration.c:488
+#: src/util/configuration.c:515
 #, c-format
-msgid "Cannot open configuration file '%s'\n"
+msgid "Cannot open configuration file '%s'.\n"
 msgstr ""
 
 #: src/util/cron.c:229
@@ -3479,7 +3577,7 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/initialize.c:151
+#: src/util/initialize.c:228
 msgid "Shutdown complete.\n"
 msgstr ""
 
@@ -3724,8 +3822,8 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
-#: src/include/gnunet_util.h:1036
+#: src/include/gnunet_util.h:1041 src/include/gnunet_util.h:1043
+#: src/include/gnunet_util.h:1050
 #, c-format
 msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
 msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2005-08-18 03:56:29 UTC (rev 1728)
+++ GNUnet/po/POTFILES.in       2005-08-18 03:59:07 UTC (rev 1729)
@@ -150,9 +150,7 @@
 src/transports/udp6.c
 src/util/bloomfilter.c
 src/util/bloomtest.c
-src/util/generate_gnunetd_conf.c
 src/util/checksum.c
-src/util/generate_gnunet_conf.c
 src/util/configtest.c
 src/util/configuration.c
 src/util/crctest.c

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2005-08-18 03:56:29 UTC (rev 1728)
+++ GNUnet/po/de.po     2005-08-18 03:59:07 UTC (rev 1729)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre5\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-18 01:09+0200\n"
+"POT-Creation-Date: 2005-08-17 21:04-0700\n"
 "PO-Revision-Date: 2005-08-07 00:20+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -20,11 +20,16 @@
 #: src/applications/advertising/advertising.c:156
 #, 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"
+msgstr ""
+"Hello Nachricht von '%s' ist ung�ltig (Signatur ist ung�ltig). Nachricht "
+"wurde verworfen.\n"
 
 #: src/applications/advertising/advertising.c:162
-msgid "hello message received invalid (expiration time over limit). 
Dropping.\n"
-msgstr "Empfangene Hello Nachricht ist ung�ltig (Ablaufzeit �ber Limit). 
Nachricht wurde verworfen.\n"
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
+msgstr ""
+"Empfangene Hello Nachricht ist ung�ltig (Ablaufzeit �ber Limit). Nachricht "
+"wurde verworfen.\n"
 
 #: src/applications/advertising/advertising.c:171
 #, c-format
@@ -46,8 +51,11 @@
 msgstr "Transport %d wird ausgew�hlten anderen Knoten bekannt gegeben.\n"
 
 #: src/applications/advertising/advertising.c:458
-msgid "Announcing ourselves pointless: no other peers are known to us so 
far.\n"
-msgstr "Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen 
Knoten bekannt.\n"
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgstr ""
+"Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
+"bekannt.\n"
 
 #: src/applications/advertising/advertising.c:560
 #, c-format
@@ -67,7 +75,7 @@
 msgstr "# Bekanntmachungen von anderen �bertragen"
 
 #: src/applications/advertising/advertising.c:726
-#: src/applications/session/connect.c:735
+#: src/applications/session/connect.c:749
 #, c-format
 msgid "'%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "'%s' registriert Handler %d (Plaintext und Ciphertext)\n"
@@ -77,52 +85,59 @@
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
 #: src/applications/advertising/advertising.c:765
-msgid "ensures that this peer is known by other peers and discovers other 
peers"
-msgstr "Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und 
entdeckt andere Knoten"
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+"Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
+"andere Knoten"
 
-#: src/applications/bootstrap_http/http.c:79
+#: src/applications/bootstrap_http/http.c:81
 #: src/applications/testbed/testbed.c:1080
 #, c-format
 msgid "Invalid URL '%s' (must begin with '%s')\n"
 msgstr "Ung�ltige URL '%s' (muss mit '%s' beginnen)\n"
 
-#: src/applications/bootstrap_http/http.c:107
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
 msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr "Ung�ltiger Port \"%s\" in Angabe der Hostlist, versuche Port %d.\n"
 
-#: src/applications/bootstrap_http/http.c:118
+#: src/applications/bootstrap_http/http.c:120
 #, c-format
 msgid "'%s' failed at %s:%d with error: '%s'.\n"
 msgstr "'%s' schlug fehl bei %s:%d mit dem Fehler: '%s'.\n"
 
-#: src/applications/bootstrap_http/http.c:131
+#: src/applications/bootstrap_http/http.c:133
 #, c-format
 msgid "Could not download list of peer contacts, host '%s' unknown.\n"
-msgstr "Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, 
Host '%s' ist unbekannt.\n"
+msgstr ""
+"Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host '%s' "
+"ist unbekannt.\n"
 
-#: src/applications/bootstrap_http/http.c:153
-#: src/applications/bootstrap_http/http.c:179
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
 #, c-format
 msgid "'%s' to '%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' an '%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/applications/bootstrap_http/http.c:215
+#: src/applications/bootstrap_http/http.c:217
 #, c-format
 msgid "Parsing HTTP response for URL '%s' failed.\n"
 msgstr "Das Parsen der HTTP Antwort f�r die URL '%s' schlug fehl.\n"
 
-#: src/applications/bootstrap_http/http.c:250
+#: src/applications/bootstrap_http/http.c:252
 #, c-format
 msgid "Parsing hello from '%s' failed.\n"
 msgstr "Das Parsen des Hello von '%s' schlug fehl.\n"
 
-#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:330
 #, c-format
 msgid "Could not resolve name of HTTP proxy '%s'. Trying without a proxy.\n"
-msgstr "Der Name des HTTP Proxies '%s' konnte nicht aufgel�st werden. Es wird 
ohne Proxy versucht.\n"
+msgstr ""
+"Der Name des HTTP Proxies '%s' konnte nicht aufgel�st werden. Es wird ohne "
+"Proxy versucht.\n"
 
-#: src/applications/bootstrap_http/http.c:350
+#: src/applications/bootstrap_http/http.c:354
 msgid "# hellos downloaded via http"
 msgstr "# Hellos per HTTP heruntergeladen"
 
@@ -175,9 +190,10 @@
 #: src/applications/template/gnunet-template.c:87
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:542
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/server/gnunet-peer-info.c:107 src/server/gnunet-transport-check.c:512
-#: src/server/gnunet-update.c:129 src/server/startup.c:512
+#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:117
+#: src/conf/gnunet-setup.c:255 src/server/gnunet-peer-info.c:107
+#: src/server/gnunet-transport-check.c:512 src/server/gnunet-update.c:129
+#: src/server/startup.c:516
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -214,8 +230,12 @@
 
 #: src/applications/datastore/filter.c:42
 #, c-format
-msgid "Configuration must specify directory for FS data in section '%s' under 
'%s'.\n"
-msgstr "Die Konfigurationsdatei muss in der Sektion '%s' unter '%s' ein 
Verzeichnis f�r FS Daten angeben.\n"
+msgid ""
+"Configuration must specify directory for FS data in section '%s' under '%"
+"s'.\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion '%s' unter '%s' ein Verzeichnis "
+"f�r FS Daten angeben.\n"
 
 #: src/applications/dht/module/cs.c:440
 #, c-format
@@ -298,7 +318,8 @@
 #: src/applications/dht/module/dht.c:3226
 #, c-format
 msgid "RPC for '%s' received for table that we do not participate in!\n"
-msgstr "RPC f�r '%s' empfangen f�r eine Tabelle, an der wir nicht beteiligt 
sind!\n"
+msgstr ""
+"RPC f�r '%s' empfangen f�r eine Tabelle, an der wir nicht beteiligt sind!\n"
 
 #: src/applications/dht/tools/dht-join.c:43
 msgid "allow SIZE bytes of memory for the local table"
@@ -493,7 +514,7 @@
 #: src/applications/dht/tools/dhttest2.c:127
 #: src/applications/gap/gaptest.c:317
 #: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:200
+#: src/applications/tbench/tbenchtest.c:199
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
@@ -504,30 +525,47 @@
 #: src/applications/tbench/tbenchtest.c:122
 #, c-format
 msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen 
verbleiben)...\n"
+msgstr ""
+"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+"verbleiben)...\n"
 
-#: src/applications/fragmentation/fragmentation.c:556
+#: src/applications/fragmentation/fragmentation.c:549
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:550
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:551
 msgid "# fragments discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:561
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr "'%s' registriert Handler %d\n"
 
-#: src/applications/fs/ecrs/download.c:889
-msgid "Decrypted content does not match key. This is either a bug or a 
maliciously inserted file. Download aborted.\n"
-msgstr "Entschl�sselter Inhalt entspricht nicht dem Schl�ssel. Dies ist 
entweder ein Bug oder eine mit b�sen Absichten eingef�gte Datei. Download wurde 
abgebrochen.\n"
+#: src/applications/fs/ecrs/download.c:121
+#, fuzzy, c-format
+msgid "Could not unlink temporary file '%s': %s\n"
+msgstr "PID konnte nicht in Datei '%s' geschrieben werden: %s.\n"
 
-#: src/applications/fs/ecrs/download.c:1054
+#: src/applications/fs/ecrs/download.c:249
+#, fuzzy, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "'%s' %s schlug fehl: %s\n"
+
+#: src/applications/fs/ecrs/download.c:893
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"Entschl�sselter Inhalt entspricht nicht dem Schl�ssel. Dies ist entweder ein "
+"Bug oder eine mit b�sen Absichten eingef�gte Datei. Download wurde "
+"abgebrochen.\n"
+
+#: src/applications/fs/ecrs/download.c:1062
 #, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr "Inhalt '%s' scheint im Netzwerk nicht verf�gbar zu sein.\n"
@@ -540,17 +578,24 @@
 #: src/applications/fs/ecrs/meta.c:785
 #, c-format
 msgid "Could not rename file '%s' to '%s': file exists\n"
-msgstr "Datei '%s' konnte nicht zu '%s' umbenannt werden: Datei existiert 
bereits\n"
+msgstr ""
+"Datei '%s' konnte nicht zu '%s' umbenannt werden: Datei existiert bereits\n"
 
 #: src/applications/fs/ecrs/namespace.c:45
 #, c-format
-msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s.\n"
-msgstr "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis f�r GNUnet 
angeben, in dem Knotenbezogene Daten gespeichert werden.\n"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
+msgstr ""
+"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis f�r GNUnet angeben, "
+"in dem Knotenbezogene Daten gespeichert werden.\n"
 
 #: src/applications/fs/ecrs/namespace.c:133
 #, c-format
 msgid "Cannot create pseudonym '%s', file '%s' exists.\n"
-msgstr "Pseudonym '%s' kann nicht erstellt werden, da die Datei '%s' bereits 
existiert.\n"
+msgstr ""
+"Pseudonym '%s' kann nicht erstellt werden, da die Datei '%s' bereits "
+"existiert.\n"
 
 #: src/applications/fs/ecrs/namespace.c:304
 #: src/applications/fs/ecrs/namespace.c:380
@@ -571,43 +616,53 @@
 msgid "Format of file '%s' is invalid.\n"
 msgstr "Format der Datei '%s' ist ung�ltig.\n"
 
-#: src/applications/fs/ecrs/search.c:158
+#: 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:210
+#: 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/upload.c:182
+#: src/applications/fs/ecrs/upload.c:175
+#, fuzzy, c-format
+msgid "'%s' is not a file.\n"
+msgstr "'%s' ist keine normale Datei.\n"
+
+#: src/applications/fs/ecrs/upload.c:192
 #, c-format
 msgid "Cannot hash '%s'.\n"
 msgstr "'%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file '%s' failed.\n"
 msgstr "Initialisierung der Indizierung der Datei '%s' fehlgeschlagen.\n"
 
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
 #, c-format
-msgid "Indexing file '%s' failed. Check file permissions and consult your 
GNUnet server's logs.\n"
-msgstr "Indizierung der Datei '%s' schlug fehl. Bitte pr�fen Sie die 
Dateiberechtigungen und ziehen Sie die Protokolldateien des GNUnet-Servers zu 
Rate.\n"
+msgid ""
+"Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+"server's logs.\n"
+msgstr ""
+"Indizierung der Datei '%s' schlug fehl. Bitte pr�fen Sie die "
+"Dateiberechtigungen und ziehen Sie die Protokolldateien des GNUnet-Servers "
+"zu Rate.\n"
 
-#: src/applications/fs/ecrs/upload.c:289
+#: src/applications/fs/ecrs/upload.c:301
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/applications/fs/fsui/download.c:239
+#: src/applications/fs/fsui/download.c:240
 msgid "Download aborted."
 msgstr "Download abgebrochen."
 
-#: src/applications/fs/fsui/download.c:242
+#: src/applications/fs/fsui/download.c:243
 msgid "ECRS download failed (see logs)."
 msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
 
-#: src/applications/fs/fsui/downloadtest.c:185
+#: 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
@@ -615,15 +670,15 @@
 msgid "AND"
 msgstr "UND"
 
-#: src/applications/fs/fsui/file_info.c:73
+#: src/applications/fs/fsui/file_info.c:76
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
 
-#: src/applications/fs/fsui/fsui.c:162
+#: src/applications/fs/fsui/fsui.c:168
 msgid "FSUI persistence: error restoring download\n"
 msgstr "FSUI Best�ndigkeit: Fehler beim Wiederherstellen des Downloads\n"
 
-#: src/applications/fs/fsui/fsui.c:597
+#: src/applications/fs/fsui/fsui.c:616
 #, 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"
@@ -634,13 +689,18 @@
 
 #: src/applications/fs/fsui/namespace_info.c:523
 msgid "Publication interval for periodic publication changed."
-msgstr "Ver�ffentlichungsintervall f�r periodische Ver�ffentlichung wurde 
ge�ndert."
+msgstr ""
+"Ver�ffentlichungsintervall f�r periodische Ver�ffentlichung wurde ge�ndert."
 
 #: src/applications/fs/fsui/namespace_info.c:544
-msgid "Publishing update for periodically updated content more than a week 
ahead of schedule.\n"
-msgstr "Ver�ffentlichungsdatum f�r periodisch aktualisierten Inhalt ist mehr 
als eine Woche fr�her als geplant.\n"
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+"Ver�ffentlichungsdatum f�r periodisch aktualisierten Inhalt ist mehr als "
+"eine Woche fr�her als geplant.\n"
 
-#: src/applications/fs/fsui/search.c:164
+#: src/applications/fs/fsui/search.c:196
 msgid "This search is already pending!\n"
 msgstr "Diese Suche l�uft bereits!\n"
 
@@ -648,54 +708,78 @@
 msgid "Unindex failed.\n"
 msgstr "Deindizierung schlug fehl.\n"
 
-#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:404
+#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:402
 msgid "Upload failed.\n"
 msgstr "Upload fehlgeschlagen.\n"
 
-#: src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:407
 msgid "Cannot upload directory without using recursion.\n"
-msgstr "Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen 
werden.\n"
+msgstr ""
+"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen "
+"werden.\n"
 
-#: src/applications/fs/module/fs.c:961
+#: src/applications/fs/module/fs.c:988
 #, c-format
-msgid "You must specify a postive number for '%s' in the configuration in 
section '%s'.\n"
-msgstr "Sie m�ssen f�r '%s' in der Sektion '%s' der Konfigurationsdatei eine 
positive Zahl angeben.\n"
+msgid ""
+"You must specify a postive number for '%s' in the configuration in section '%"
+"s'.\n"
+msgstr ""
+"Sie m�ssen f�r '%s' in der Sektion '%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1002
+#: src/applications/fs/module/fs.c:1029
 #, c-format
 msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1039
+#: src/applications/fs/module/fs.c:1066
 msgid "enables (anonymous) file-sharing"
 msgstr "Erm�glicht (anonymes) Filesharing"
 
 #: src/applications/fs/module/ondemand.c:71
 #, c-format
-msgid "You must specify a directory for FS files in the configuration in 
section '%s' under '%s'."
-msgstr "Sie m�ssen ein Verzeichnis f�r FS Dateien in der Konfigurationsdatei 
in der Sektion '%s' unter '%s' angeben."
+msgid ""
+"You must specify a directory for FS files in the configuration in section '%"
+"s' under '%s'."
+msgstr ""
+"Sie m�ssen ein Verzeichnis f�r FS Dateien in der Konfigurationsdatei in der "
+"Sektion '%s' unter '%s' angeben."
 
 #: src/applications/fs/module/ondemand.c:326
 #, c-format
 msgid "Indexed file disappeared, deleting block for query '%s'\n"
-msgstr "Indizierte Datei ist verschwunden, Block f�r Anfrage '%s' wird 
gel�scht\n"
+msgstr ""
+"Indizierte Datei ist verschwunden, Block f�r Anfrage '%s' wird gel�scht\n"
 
 #: src/applications/fs/module/ondemand.c:416
 #, c-format
-msgid "Because the file '%s' has been unavailable for 3 days it got removed 
from your share.  Please unindex files before deleting them as the index now 
contains invalid references!"
-msgstr "Weil die Datei '%s' nun seit 3 Tagen nicht zur Verf�gung steht, wurde 
Sie aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie 
l�schen, da Ihr Index nun ung�ltige Referenzen enth�lt!"
+msgid ""
+"Because the file '%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!"
+msgstr ""
+"Weil die Datei '%s' nun seit 3 Tagen nicht zur Verf�gung steht, wurde Sie "
+"aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
+"l�schen, da Ihr Index nun ung�ltige Referenzen enth�lt!"
 
 #: src/applications/fs/module/ondemand.c:442
 #, c-format
-msgid "Configuration file must specify directory for storage of FS data in 
section '%s' under '%s'.\n"
-msgstr "Die Konfigurationsdatei muss ein Verzeichnis f�r die Speicherung von 
FS Daten in der Sektion '%s' unter '%s' angeben.\n"
+msgid ""
+"Configuration file must specify directory for storage of FS data in section "
+"'%s' under '%s'.\n"
+msgstr ""
+"Die Konfigurationsdatei muss ein Verzeichnis f�r die Speicherung von FS "
+"Daten in der Sektion '%s' unter '%s' angeben.\n"
 
 #: src/applications/fs/module/ondemand.c:637
 #, c-format
-msgid "Unindexed ODB block '%s' from offset %llu already missing from 
datastore.\n"
-msgstr "Deindizierter ODB Block '%s' vom Offset %llu fehlt bereits im 
Datenspeicher.\n"
+msgid ""
+"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
+msgstr ""
+"Deindizierter ODB Block '%s' vom Offset %llu fehlt bereits im "
+"Datenspeicher.\n"
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1904
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken �ber den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
@@ -706,13 +790,16 @@
 
 #: src/applications/fs/tools/gnunet-delete.c:52
 msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr "vom GNUnet zu l�schende Datei angeben (obgligatorisch, Datei muss 
existieren)"
+msgstr ""
+"vom GNUnet zu l�schende Datei angeben (obgligatorisch, Datei muss existieren)"
 
 #: src/applications/fs/tools/gnunet-delete.c:61
 msgid ""
 "Remove file from GNUnet.  The specified file is not removed\n"
 "from the filesystem but just from the local GNUnet datastore."
-msgstr "Datei auf GNUnet l�schen. Die angegebene Datei wird nicht aus dem 
Dateisystem gel�scht, sondern aus dem lokalen GNUnet Datenspeicher."
+msgstr ""
+"Datei auf GNUnet l�schen. Die angegebene Datei wird nicht aus dem "
+"Dateisystem gel�scht, sondern aus dem lokalen GNUnet Datenspeicher."
 
 #: src/applications/fs/tools/gnunet-delete.c:139
 msgid "You must specify a filename (option -f)\n"
@@ -749,7 +836,9 @@
 
 #: src/applications/fs/tools/gnunet-directory.c:124
 msgid "remove all entries from the directory database and stop tracking URIs"
-msgstr "Alle Eintr�ge aus der Verzeichnis Datenbank l�schen und das Verfolgen 
von URIs abbrechen"
+msgstr ""
+"Alle Eintr�ge aus der Verzeichnis Datenbank l�schen und das Verfolgen von "
+"URIs abbrechen"
 
 #: src/applications/fs/tools/gnunet-directory.c:126
 msgid "list entries from the directory database"
@@ -815,7 +904,8 @@
 #: src/applications/fs/tools/gnunet-download.c:191
 #, c-format
 msgid "Download of file '%s' complete.  Speed was %8.3f kilobyte per second.\n"
-msgstr "Download der Datei '%s' abgeschlossen. Geschwindigkeit war %8.3f 
KB/s.\n"
+msgstr ""
+"Download der Datei '%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
 
 #: src/applications/fs/tools/gnunet-download.c:203
 #, c-format
@@ -840,7 +930,9 @@
 #: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
 msgid "Failed to add entry to namespace '%s' (does it exist?)\n"
-msgstr "Der Eintrag konnte dem Namespace '%s' nicht hinzugef�gt werden 
(existiert er?)\n"
+msgstr ""
+"Der Eintrag konnte dem Namespace '%s' nicht hinzugef�gt werden (existiert "
+"er?)\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:136
 #, c-format
@@ -850,12 +942,15 @@
 #: 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 "Upload von '%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f 
KB/s).\n"
+msgstr ""
+"Upload von '%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:164
 #, c-format
 msgid "Upload of '%s' complete, current average speed is %8.3f kbps.\n"
-msgstr "Upload con '%s' komplett, derzeitige durchschnittliche Geschwindigkeit 
betr�gt %8.3f KB/s.\n"
+msgstr ""
+"Upload con '%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+"betr�gt %8.3f KB/s.\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:174
 #, c-format
@@ -877,36 +972,67 @@
 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 copy instead of making a link to the GNUnet share directory"
-msgstr "Obwohl gnunetd auf der lokalen Maschiene l�uft die Erstellung einer 
Kopie anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis 
erzwingen."
+msgid ""
+"even if gnunetd is running on the local machine, force the creation of a "
+"copy instead of making a link to the GNUnet share directory"
+msgstr ""
+"Obwohl gnunetd auf der lokalen Maschiene l�uft die Erstellung einer Kopie "
+"anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
+"erzwingen."
 
 #: src/applications/fs/tools/gnunet-insert.c:212
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
-msgstr "Liste der extrahierten Schl�sselworte, die verwendet werden w�rden, 
ausgeben, aber keinen Upload durchf�hren"
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"Liste der extrahierten Schl�sselworte, die verwendet werden w�rden, "
+"ausgeben, aber keinen Upload durchf�hren"
 
 #: src/applications/fs/tools/gnunet-insert.c:216
-msgid "set interval for availability of updates to SECONDS (for namespace 
insertions only)"
-msgstr "Intervall der Verf�gbarkeit von Updates auf SECONDS setzen (nur f�r 
das Einf�gen in Namespaces)"
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
+msgstr ""
+"Intervall der Verf�gbarkeit von Updates auf SECONDS setzen (nur f�r das "
+"Einf�gen in Namespaces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:219
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
-msgstr "Ein zus�tzliches Schl�sselwort f�r die Datei oder das Verzeichnis auf 
der obersten Ebene hinzuf�gen (diese Option kann mehrmals angegeben werden)"
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"Ein zus�tzliches Schl�sselwort f�r die Datei oder das Verzeichnis auf der "
+"obersten Ebene hinzuf�gen (diese Option kann mehrmals angegeben werden)"
 
 #: src/applications/fs/tools/gnunet-insert.c:222
-msgid "add an additional keyword for all files and directories (this option 
can be specified multiple times)"
-msgstr "Ein zus�tzliches Schl�sselwort f�r alle Dateien und Verzeichnisse 
hinzuf�gen (diese Option kann mehrmals angegeben werden)"
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
+msgstr ""
+"Ein zus�tzliches Schl�sselwort f�r alle Dateien und Verzeichnisse hinzuf�gen "
+"(diese Option kann mehrmals angegeben werden)"
 
 #: src/applications/fs/tools/gnunet-insert.c:226
 msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert 
VALUE setzen"
+msgstr ""
+"Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
+"setzen"
 
 #: src/applications/fs/tools/gnunet-insert.c:228
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
-msgstr "Nicht indizieren, sondern komplett einf�gen (speichert die gesamte 
Datei in verschl�sselter Form in der GNUnet Datenbank)"
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"Nicht indizieren, sondern komplett einf�gen (speichert die gesamte Datei in "
+"verschl�sselter Form in der GNUnet Datenbank)"
 
 #: src/applications/fs/tools/gnunet-insert.c:231
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
-msgstr "ID einer aktualisierten Version angeben, die in der Zukunft 
ver�ffentlich werden soll. (nur f�r das Einf�gen in Namespaces)"
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"ID einer aktualisierten Version angeben, die in der Zukunft ver�ffentlich "
+"werden soll. (nur f�r das Einf�gen in Namespaces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:234
 msgid "specify the priority of the content"
@@ -914,19 +1040,28 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:236
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr "Die Datei unter dem Pseudonym NAME ver�ffentlichen (platziert die 
Datei in einem Namespace)"
+msgstr ""
+"Die Datei unter dem Pseudonym NAME ver�ffentlichen (platziert die Datei in "
+"einem Namespace)"
 
 #: src/applications/fs/tools/gnunet-insert.c:238
 msgid "process directories recursively"
 msgstr "Verzeichnisse rekursiv bearbeiten"
 
 #: src/applications/fs/tools/gnunet-insert.c:240
-msgid "specifies this as an aperiodic but updated publication (for namespace 
insertions only)"
-msgstr "Dies als unregelm��ige aber aktualisierbare Ver�ffentlichung 
kennzeichnen (nur f�r das Einf�gen in Namespaces)"
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
+msgstr ""
+"Dies als unregelm��ige aber aktualisierbare Ver�ffentlichung kennzeichnen "
+"(nur f�r das Einf�gen in Namespaces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:243
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
-msgstr "die ID dieser Version der Ver�ffentlichung setzen (nur f�r das 
Einf�gen in Namespaces)"
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+"die ID dieser Version der Ver�ffentlichung setzen (nur f�r das Einf�gen in "
+"Namespaces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:246
 msgid "specify creation time for SBlock (see man-page for format)"
@@ -934,7 +1069,8 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:248
 msgid "ID of the previous version of the content (for namespace update only)"
-msgstr "ID der vorherigen Version des Inhalts (nur f�r das Einf�gen in 
Namespaces)"
+msgstr ""
+"ID der vorherigen Version des Inhalts (nur f�r das Einf�gen in Namespaces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:255
 msgid "Make files available to GNUnet for sharing."
@@ -987,7 +1123,9 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:35
 msgid "automate creation of a namespace by starting a collection"
-msgstr "Erstellung eines Namespaces durch das Anfangen einer Collection 
automatisieren"
+msgstr ""
+"Erstellung eines Namespaces durch das Anfangen einer Collection "
+"automatisieren"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:38
 msgid "create a new pseudonym under the given NICKNAME"
@@ -999,47 +1137,78 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:42
 msgid "end automated building of a namespace (ends collection)"
-msgstr "Automatisierte Erstellung eines Namespaces beenden (beendet 
Collection)"
+msgstr ""
+"Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:46
-msgid "use the given keyword to advertise the namespace (use when creating a 
new pseudonym)"
-msgstr "Das angegebene schl�sselwort verwenden, um den Namespace 
bekanntzumachen (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"Das angegebene schl�sselwort verwenden, um den Namespace bekanntzumachen (zu "
+"verwenden, wenn ein neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid "specify that the contents of the namespace are of the given MIMETYPE 
(use when creating a new pseudonym)"
-msgstr "Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind 
(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"specify that the contents of the namespace are of the given MIMETYPE (use "
+"when creating a new pseudonym)"
+msgstr ""
+"Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind (zu "
+"verwenden, wenn ein neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:50
-msgid "do not generate an advertisement for this namespace (use when creating 
a new pseudonym)"
-msgstr "Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, 
wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, wenn ein "
+"neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:52
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "Keine Ausgabe der Pseudonyme in der Pseudonymdatenbank"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:54
-msgid "specify NAME to be the realname of the user controlling the namespace 
(use when creating a new pseudonym)"
-msgstr "NAME als den Realnamen des Benutzers angeben, der den Namespace 
verwaltet (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"specify NAME to be the realname of the user controlling the namespace (use "
+"when creating a new pseudonym)"
+msgstr ""
+"NAME als den Realnamen des Benutzers angeben, der den Namespace verwaltet "
+"(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid "specify IDENTIFIER to be the address of the entrypoint to content in 
the namespace (use when creating a new pseudonym)"
-msgstr "IDENTIFIER als Adresse angeben, die der Einsprungspunkt zu den 
Inhalten im Namespace ist (zu verwenden, wenn ein neues Pseudonym erstellt 
wird)"
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"IDENTIFIER als Adresse angeben, die der Einsprungspunkt zu den Inhalten im "
+"Namespace ist (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:58
 msgid "set the rating of a namespace"
 msgstr "das Rating eines Namespaces setzen"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid "use DESCRIPTION to describe the content of the namespace (use when 
creating a new pseudonym)"
-msgstr "DESCRIPTION als Beschreibung der Inhalte des Namespaces verwenden (zu 
verwenden, wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"use DESCRIPTION to describe the content of the namespace (use when creating "
+"a new pseudonym)"
+msgstr ""
+"DESCRIPTION als Beschreibung der Inhalte des Namespaces verwenden (zu "
+"verwenden, wenn ein neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid "specify the given URI as an address that contains more information 
about the namespace (use when creating a new pseudonym)"
-msgstr "die angegebene URI als die Adresse angeben, die weitere Informationen 
�ber den Namespace enth�lt (zu verwenden, wenn ein neues Pseudonym erstellt 
wird)"
+msgid ""
+"specify the given URI as an address that contains more information about the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"die angegebene URI als die Adresse angeben, die weitere Informationen �ber "
+"den Namespace enth�lt (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:67
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Erstellen von neuen Pseudonymen, L�schen von Pseudonymen und Auflisten 
von bestehenden Pseudonymen."
+msgstr ""
+"Erstellen von neuen Pseudonymen, L�schen von Pseudonymen und Auflisten von "
+"bestehenden Pseudonymen."
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
@@ -1047,7 +1216,8 @@
 msgstr "Ung�ltiger Parameter: '%s'\n"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:223
-#: src/server/gnunet-peer-info.c:118 src/server/gnunet-transport-check.c:523
+#: src/conf/gnunet-setup.c:184 src/server/gnunet-peer-info.c:118
+#: src/server/gnunet-transport-check.c:523
 msgid "Invalid arguments. Exiting.\n"
 msgstr "Ung�ltige Parameter. Abbruch.\n"
 
@@ -1129,12 +1299,16 @@
 
 #: src/applications/fs/tools/gnunet-search.c:219
 msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr "Nicht gen�gend Parameter. Sie m�ssen ein Schl�sselwort oder einen 
Bezeichner angeben.\n"
+msgstr ""
+"Nicht gen�gend Parameter. Sie m�ssen ein Schl�sselwort oder einen Bezeichner "
+"angeben.\n"
 
 #: src/applications/fs/tools/gnunet-search.c:270
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
-msgstr "Das Starten der Suche schlug fehl. Bitte ziehen Sie die 
Protokolldateien zu Rate.\n"
+msgstr ""
+"Das Starten der Suche schlug fehl. Bitte ziehen Sie die Protokolldateien zu "
+"Rate.\n"
 
 #: src/applications/fs/tools/gnunet-search.c:345
 #, c-format
@@ -1143,8 +1317,12 @@
 
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
-msgid "%16llu of %16llu bytes unindexed (estimating %llu seconds to 
completion)                "
-msgstr "%16llu von %16llu Bytes deindiziert (sch�tze %llu Sekunden bis 
Fertigstellung)            "
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
+msgstr ""
+"%16llu von %16llu Bytes deindiziert (sch�tze %llu Sekunden bis "
+"Fertigstellung)            "
 
 #: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
@@ -1153,7 +1331,8 @@
 "Unindexing of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
 msgstr ""
 "\n"
-"Deindizierung von '%s' abgeschlossen, %llu Bytes ben�tigten %llu Sekunden 
(%8.3f kbps).\n"
+"Deindizierung von '%s' abgeschlossen, %llu Bytes ben�tigten %llu Sekunden (%"
+"8.3f kbps).\n"
 
 #: src/applications/fs/tools/gnunet-unindex.c:71
 #, c-format
@@ -1178,20 +1357,29 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr "'%s' schlug fehl. Ist '%s' eine Datei?\n"
 
-#: src/applications/gap/gap.c:1869
-msgid "Cover traffic requested but traffic service not loaded.  Rejecting 
request.\n"
-msgstr "Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst 
wurde nicht geladen. Anfrage wird abgelehnt.\n"
+#: src/applications/gap/gap.c:1893
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+msgstr ""
+"Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
+"nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
-#: src/applications/gap/gap.c:1897
+#: src/applications/gap/gap.c:1910 src/applications/gap/gap.c:1915
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
-msgstr "Gew�nschter Grad an Anonymit�t kann nicht erreicht werden, Anfrage 
wird ignoriert.\n"
+msgstr ""
+"Gew�nschter Grad an Anonymit�t kann nicht erreicht werden, Anfrage wird "
+"ignoriert.\n"
 
-#: src/applications/gap/gap.c:2113
-msgid "Traffic service failed to load; gap cannot ensure cover-traffic 
availability.\n"
-msgstr "Verkehrsdienst konnte nicht geladen werden, GAP kann keinen 
verdeckenden Netzwerkverkehr sicherstellen.\n"
+#: src/applications/gap/gap.c:2152
+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:2144
+#: src/applications/gap/gap.c:2183
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr "'%s' registriert Handler %d %d\n"
@@ -1206,15 +1394,22 @@
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:976
+#: src/applications/identity/identity.c:1024
 #, c-format
-msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s\n"
-msgstr "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis angeben, in 
dem GNUnet knotenspezifische Daten speichern kann.\n"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s\n"
+msgstr ""
+"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis angeben, in dem "
+"GNUnet knotenspezifische Daten speichern kann.\n"
 
 #: src/applications/identity/hostkey.c:119
 #, c-format
-msgid "Existing hostkey in file '%s' failed format check, creating new 
hostkey.\n"
-msgstr "Format�berpr�fung schlug f�r die existierende Hostkeydatei '%s' fehl, 
es wird ein neuer Hostkey erzeugt.\n"
+msgid ""
+"Existing hostkey in file '%s' failed format check, creating new hostkey.\n"
+msgstr ""
+"Format�berpr�fung schlug f�r die existierende Hostkeydatei '%s' fehl, es "
+"wird ein neuer Hostkey erzeugt.\n"
 
 #: src/applications/identity/hostkey.c:127
 msgid "Creating new hostkey (this may take a while).\n"
@@ -1228,18 +1423,21 @@
 msgid "Done creating hostkey.\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/applications/identity/identity.c:330
+#: src/applications/identity/identity.c:324
 #, c-format
-msgid "File '%s' in directory '%s' does not match naming convention. 
Removed.\n"
-msgstr "Die Datei '%s' im Verzeichnis '%s' entspricht nicht der 
Namenskonvention. Datei wurde entfernt.\n"
+msgid ""
+"File '%s' in directory '%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Die Datei '%s' im Verzeichnis '%s' entspricht nicht der Namenskonvention. "
+"Datei wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:363
+#: src/applications/identity/identity.c:357
 #, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr "%s '%s' ergab keine bekannten Knoten!\n"
 
-#: src/applications/identity/identity.c:614
-#: src/applications/identity/identity.c:632
+#: src/applications/identity/identity.c:637
+#: src/applications/identity/identity.c:655
 #, c-format
 msgid "Removed file '%s' containing invalid hello data.\n"
 msgstr "Datei '%s' enthielt ung�ltige Hello Daten und wurde entfernt.\n"
@@ -1262,12 +1460,18 @@
 
 #: src/applications/pingpong/pingpong.c:251
 #: src/applications/pingpong/pingpong.c:309
-msgid "Could not match PONG against any PING. Try increasing MAX_PING_PONG 
constant.\n"
-msgstr "PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante 
MAX_PING_PONG hochzusetzen.\n"
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+"PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
+"MAX_PING_PONG hochzusetzen.\n"
 
 #: src/applications/pingpong/pingpong.c:350
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
-msgstr "PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen 
Sie, die Konstante MAX_PING_PONG hochzusetzen.\n"
+msgstr ""
+"PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
+"die Konstante MAX_PING_PONG hochzusetzen.\n"
 
 #: src/applications/pingpong/pingpong.c:467
 msgid "# encrypted PONG messages received"
@@ -1304,13 +1508,21 @@
 
 #: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be registered: another callback is already 
using this name (%p)\n"
-msgstr "%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer 
Callback verwendet bereits diesen Namen (%p)\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr ""
+"%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer Callback "
+"verwendet bereits diesen Namen (%p)\n"
 
 #: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: another callback 
registered under that name: %p\n"
-msgstr "%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer 
Callback ist unter diesem Namen registiert: %p\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer Callback "
+"ist unter diesem Namen registiert: %p\n"
 
 #: src/applications/rpc/rpc.c:232
 #, c-format
@@ -1320,7 +1532,8 @@
 #: src/applications/rpc/rpc.c:279
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht 
gefunden\n"
+msgstr ""
+"%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
 #: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
 #: src/applications/rpc/rpc.c:1084
@@ -1356,105 +1569,121 @@
 msgid "async RPC reply not received.\n"
 msgstr "async RPC Antwort nicht empfangen.\n"
 
-#: src/applications/session/connect.c:208
+#: 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/session/connect.c:245
+#: 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"
+msgstr ""
+"Sitzungsschl�ssel kann nicht verschl�sselt werden, der andere Knoten ist uns "
+"nicht bekannt!\n"
 
-#: src/applications/session/connect.c:518
+#: src/applications/session/connect.c:520
 #, c-format
 msgid "Invalid '%s' message received from peer '%s'.\n"
 msgstr "Ung�ltige '%s' Nachricht von Knoten '%s' empfangen.\n"
 
-#: src/applications/session/connect.c:526
-#, c-format
-msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
-msgstr "SKEY von '%s' hat eine ung�ltige CRC Pr�fsumme (tats�chlich: %u, 
erwartet: %u).\n"
+#: src/applications/session/connect.c:529
+#, fuzzy, c-format
+msgid "setkey '%s' from '%s' fails CRC check (have: %u, want %u).\n"
+msgstr ""
+"SKEY von '%s' hat eine ung�ltige CRC Pr�fsumme (tats�chlich: %u, erwartet: %"
+"u).\n"
 
-#: src/applications/session/connect.c:578
-msgid "Error parsing encrypted session key, given message part size is 
invalid.\n"
-msgstr "Fehler beim Parsen des Verschl�sselten Sitzungsschl�ssels, gegebene 
NachrichtenteilGr��e ist ung�ltig.\n"
+#: src/applications/session/connect.c:584
+msgid ""
+"Error parsing encrypted session key, given message part size is invalid.\n"
+msgstr ""
+"Fehler beim Parsen des Verschl�sselten Sitzungsschl�ssels, gegebene "
+"NachrichtenteilGr��e ist ung�ltig.\n"
 
-#: src/applications/session/connect.c:725
+#: src/applications/session/connect.c:739
 msgid "# session keys sent"
 msgstr "# Sitzungsschl�ssel gesendet"
 
-#: src/applications/session/connect.c:727
+#: src/applications/session/connect.c:741
 msgid "# session keys rejected"
 msgstr "# Sitzungsschl�ssel abgelehnt"
 
-#: src/applications/session/connect.c:729
+#: src/applications/session/connect.c:743
 msgid "# session keys accepted"
 msgstr "# Sitzungsschl�ssel akzeptiert"
 
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:745
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
-#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:159
-#: src/applications/sqstore_mysql/mysql.c:348
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:835
-#: src/applications/sqstore_mysql/mysql.c:914
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
+#: src/applications/sqstore_mysql/mysql.c:149
+#: src/applications/sqstore_mysql/mysql.c:156
+#: src/applications/sqstore_mysql/mysql.c:362
+#: src/applications/sqstore_mysql/mysql.c:689
+#: src/applications/sqstore_mysql/mysql.c:704
+#: src/applications/sqstore_mysql/mysql.c:713
+#: src/applications/sqstore_mysql/mysql.c:737
+#: src/applications/sqstore_mysql/mysql.c:747
+#: src/applications/sqstore_mysql/mysql.c:796
+#: src/applications/sqstore_mysql/mysql.c:875
+#: src/applications/sqstore_mysql/mysql.c:885
+#: src/applications/sqstore_mysql/mysql.c:955
+#: src/applications/sqstore_mysql/mysql.c:964
+#: src/applications/sqstore_sqlite/sqlite.c:43
+#: src/applications/sqstore_sqlite/sqlite.c:50 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
-#: src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1025 src/include/gnunet_util.h:1032
+#: src/include/gnunet_util.h:1034
 #, 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_mysql/mysql.c:462
-#: src/applications/sqstore_mysql/mysql.c:547
-#: src/applications/sqstore_mysql/mysql.c:647
-#: src/applications/sqstore_mysql/mysql.c:802
-#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:505
+#: src/applications/sqstore_mysql/mysql.c:602
+#: src/applications/sqstore_mysql/mysql.c:763
+#: src/applications/sqstore_mysql/mysql.c:777
 msgid "Invalid data in MySQL database.  Please verify integrity!\n"
-msgstr "Ung�ltige Daten in der MySQL Datenbank. Bitte �berpr�fen Sie die 
Integrit�t!\n"
+msgstr ""
+"Ung�ltige Daten in der MySQL Datenbank. Bitte �berpr�fen Sie die "
+"Integrit�t!\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1108
+#: src/applications/sqstore_mysql/mysql.c:1065
 #, c-format
 msgid "Query '%s' had no results.\n"
 msgstr "Abfrage '%s' hatte keine Ergebnisse.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1199
+#: src/applications/sqstore_mysql/mysql.c:1156
 #, 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/mysqltest.c:257
-#: src/applications/sqstore_sqlite/sqlitetest.c:259
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/sqstore_sqlite/sqlitetest.c:258
 msgid "Could not initialize libgnunetutil!\n"
 msgstr "Konnte libgnunetutil nicht initialisieren!\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:181
-#: src/applications/sqstore_sqlite/sqlite.c:201
+#: src/applications/sqstore_sqlite/sqlite.c:197
+#: src/applications/sqstore_sqlite/sqlite.c:217
 msgid "SQL Database corrupt, ignoring result.\n"
 msgstr "SQL Datenbank besch�digt, Ergebnis wird ignoriert.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:406
-#: src/applications/sqstore_sqlite/sqlite.c:601
+#: src/applications/sqstore_sqlite/sqlite.c:428
+#: src/applications/sqstore_sqlite/sqlite.c:621
 msgid "Invalid data in database.  Please verify integrity!\n"
-msgstr "Es befinden sich ung�ltige Daten in Datenbank. Bitte �berpr�fen Sie 
die Integrit�t!\n"
+msgstr ""
+"Es befinden sich ung�ltige Daten in Datenbank. Bitte �berpr�fen Sie die "
+"Integrit�t!\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:915
+#: src/applications/sqstore_sqlite/sqlite.c:979
 #, c-format
-msgid "Configuration file must specify directory for storing FS data in 
section '%s' under '%s'.\n"
-msgstr "Die Konfigurationsdatei muss in der Sektion '%s' unter '%s' ein 
Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+msgid ""
+"Configuration file must specify directory for storing FS data in section '%"
+"s' under '%s'.\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion '%s' unter '%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:929
+#: src/applications/sqstore_sqlite/sqlite.c:993
 msgid "Unable to initialize SQLite.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
@@ -1558,7 +1787,8 @@
 #: src/applications/tbench/gnunet-tbench.c:228
 #, c-format
 msgid "Invalid receiver peer ID specified ('%s' is not valid name).\n"
-msgstr "Ung�ltige Empf�ngerknoten ID angegeben ('%s' ist kein g�ltiger 
Name).\n"
+msgstr ""
+"Ung�ltige Empf�ngerknoten ID angegeben ('%s' ist kein g�ltiger Name).\n"
 
 #: src/applications/tbench/gnunet-tbench.c:249
 #, c-format
@@ -1624,7 +1854,7 @@
 "\n"
 "Es wurde keine Nachricht von gnunetd empfangen. L�uft gnunetd?\n"
 
-#: src/applications/tbench/tbench.c:447
+#: 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"
 
@@ -1652,7 +1882,7 @@
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/applications/tbench/tbenchtest.c:212
+#: src/applications/tbench/tbenchtest.c:211
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Benchmark l�uft...\n"
@@ -1694,7 +1924,8 @@
 "Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
 "Trying again in %d seconds...\n"
 msgstr ""
-"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst 
wurde nicht gestartet.\n"
+"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst "
+"wurde nicht gestartet.\n"
 "Erneuter Versuch in %d Sekunden...\n"
 
 #: src/applications/testbed/gnunet-testbed.c:411 src/server/tcpserver.c:523
@@ -1719,7 +1950,8 @@
 #: src/applications/testbed/gnunet-testbed.c:590
 #, c-format
 msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-msgstr "Besch�digter Eintrag in der Konfigurationsdatei in Sektion %s unter 
%s: %s\n"
+msgstr ""
+"Besch�digter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: %s\n"
 
 #: src/applications/testbed/testbed.c:50
 msgid "Could not send acknowledgement back to client.\n"
@@ -1744,7 +1976,8 @@
 #: 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"
+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
@@ -1792,7 +2025,8 @@
 
 #: src/applications/testbed/testbed.c:833
 msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-msgstr "Dateiname f�r UPLOAD_FILE Nachricht ist nicht Null-terminiert 
(ung�ltig!)\n"
+msgstr ""
+"Dateiname f�r UPLOAD_FILE Nachricht ist nicht Null-terminiert (ung�ltig!)\n"
 
 #: src/applications/testbed/testbed.c:841
 msgid "Upload refused!"
@@ -1810,12 +2044,16 @@
 
 #: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "Received testbed message of type %u but unexpected size %u, expected 
%u\n"
-msgstr "Empfangene Testbed Nachricht des Typs %u hat die unerwartete Gr��e %u, 
es wurde %u erwartet\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr ""
+"Empfangene Testbed Nachricht des Typs %u hat die unerwartete Gr��e %u, es "
+"wurde %u erwartet\n"
 
 #: src/applications/testbed/testbed.c:1046
 msgid "No testbed URL given, not registered.\n"
-msgstr "Keine Testbed URL angegeben, es wurde keine Registrierung 
vorgenommen.\n"
+msgstr ""
+"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
 
 #: src/applications/testbed/testbed.c:1056 src/transports/http.c:1451
 #, c-format
@@ -1825,12 +2063,15 @@
 #: src/applications/testbed/testbed.c:1119
 #, c-format
 msgid "Malformed http URL: '%s' at '%s'.  Testbed-client not registered.\n"
-msgstr "Besch�digte HTTP URL: '%s' bei '%s'. Testbed-Client wurde nicht 
registriert.\n"
+msgstr ""
+"Besch�digte HTTP URL: '%s' bei '%s'. Testbed-Client wurde nicht "
+"registriert.\n"
 
 #: src/applications/testbed/testbed.c:1155
 #, c-format
 msgid "Could not register testbed, host '%s' unknown\n"
-msgstr "Testbed konnte nicht registriert werden, Host '%s' ist nicht 
bekannt.\n"
+msgstr ""
+"Testbed konnte nicht registriert werden, Host '%s' ist nicht bekannt.\n"
 
 #: src/applications/testbed/testbed.c:1177
 #, c-format
@@ -1850,15 +2091,20 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr "Erm�glicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
 
-#: src/applications/topology_default/topology.c:388
+#: src/applications/topology_default/topology.c:400
 #, 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"
+msgstr ""
+"Versionen stimmen nicht �berein ('%s' vs. '%*.s'), lassen Sie gnunet-update "
+"laufen!\n"
 
 #: src/applications/topology_f2f/topology.c:301
 #, c-format
-msgid "Need to have list of friends in configuration under '%s' in section 
'%s'.\n"
-msgstr "Es muss eine Liste von Freunden in der Konfigurationsdatei unter '%s' 
in der Sektion '%s' angegeben werden.\n"
+msgid ""
+"Need to have list of friends in configuration under '%s' in section '%s'.\n"
+msgstr ""
+"Es muss eine Liste von Freunden in der Konfigurationsdatei unter '%s' in der "
+"Sektion '%s' angegeben werden.\n"
 
 #: src/applications/topology_f2f/topology.c:320
 #, c-format
@@ -1879,7 +2125,8 @@
 msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
 
 #: src/applications/tracekit/gnunet-tracekit.c:103
-msgid "specify output format; 0 for human readable output, 1 for dot, 2 for 
vcg"
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr "Gibt das Ausgabeformat an: 0 f�r menschen-lesbar, 1 f�r dot, 2 f�r vcg"
 
 #: src/applications/tracekit/gnunet-tracekit.c:107
@@ -1901,8 +2148,12 @@
 
 #: src/applications/tracekit/gnunet-tracekit.c:233
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for 
vcg.\n"
-msgstr "Formatangabe ung�ltig. Verwenden Sie 0 f�r menschen-lesbar, 1 f�r dot 
und 2 f�r vcg.\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
+msgstr ""
+"Formatangabe ung�ltig. Verwenden Sie 0 f�r menschen-lesbar, 1 f�r dot und 2 "
+"f�r vcg.\n"
 
 #: src/applications/tracekit/gnunet-tracekit.c:260
 #, c-format
@@ -1912,7 +2163,8 @@
 #: src/applications/tracekit/gnunet-tracekit.c:275
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
-msgstr "Formatangabe ung�ltig. Verwenden Sie 0 f�r menschen-lesbar und 1 f�r 
dot\n"
+msgstr ""
+"Formatangabe ung�ltig. Verwenden Sie 0 f�r menschen-lesbar und 1 f�r dot\n"
 
 #: src/applications/tracekit/gnunet-tracekit.c:298
 #, c-format
@@ -1964,41 +2216,55 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/applications/transport/transport.c:469
-#: src/applications/transport/transport.c:477
+#: src/applications/transport/transport.c:471
+#: src/applications/transport/transport.c:479
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:635
+#: src/applications/transport/transport.c:639
 #, c-format
 msgid "Option '%s' not set in configuration in section '%s', setting to %dm.\n"
-msgstr "Option '%s' ist in der Konfigurationsdatei in der Sektion '%s' nicht 
gesetzt, sie wird auf %dm gesetzt.\n"
+msgstr ""
+"Option '%s' ist in der Konfigurationsdatei in der Sektion '%s' nicht "
+"gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:654
 #, c-format
-msgid "You should specify at least one transport service under option '%s' in 
section '%s'.\n"
-msgstr "Sie sollten mindestens einen Transport Dienst unter der Option '%s' in 
der Sektion '%s' angegeben.\n"
+msgid ""
+"You should specify at least one transport service under option '%s' in "
+"section '%s'.\n"
+msgstr ""
+"Sie sollten mindestens einen Transport Dienst unter der Option '%s' in der "
+"Sektion '%s' angegeben.\n"
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:680
 #, c-format
 msgid "Transport library '%s' did not provide required function '%s%s'.\n"
-msgstr "Transport Bibliothek '%s' stellt nicht die ben�tigte Funktion '%s%s' 
zur Verf�gung.\n"
+msgstr ""
+"Transport Bibliothek '%s' stellt nicht die ben�tigte Funktion '%s%s' zur "
+"Verf�gung.\n"
 
-#: src/applications/transport/transport.c:697
+#: src/applications/transport/transport.c:701
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr "Ich bin Peer '%s'.\n"
 
-#: src/conf/recreate.c:71
-#, c-format
-msgid "Unable to save configuration files: %s.\n"
+#: src/conf/conf.c:522 src/conf/recreate.c:100
+#, fuzzy, c-format
+msgid "Unable to save configuration file '%s': %s.\n"
 msgstr "Fehler beim Speichern der Konfigurationsdateien: %s\n"
 
-#: src/conf/recreate.c:75
-msgid "Configuration files (re)created.\n"
+#: src/conf/conf.c:529
+#, fuzzy, c-format
+msgid "Configuration file '%s' created.\n"
 msgstr "Konfigurationsdateien wurden (neu) erzeugt.\n"
 
+#: src/conf/confdata.c:93
+#, c-format
+msgid "%s: symbol value '%s' invalid for %s\n"
+msgstr ""
+
 #: src/conf/gconf_interface.c:135
 msgid "Gtk GNUnet Configurator"
 msgstr "Gtk GNUnet Konfigurator"
@@ -2156,113 +2422,170 @@
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmapdatei %s konnte nicht gefunden werden"
 
-#: src/conf/gnunet-setup.c:33
+#: src/conf/gnunet-setup.c:93
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:101
+msgid "Tool to setup GNUnet."
+msgstr ""
+
+#: src/conf/gnunet-setup.c:102
+#, c-format
+msgid "Available MODEs:\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:103
+#, fuzzy, c-format
+msgid " config\t\ttext-based configuration\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/conf/gnunet-setup.c:105
+#, c-format
+msgid " menuconfig\ttext-based menu\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:107
+#, c-format
+msgid " wizard-curses\tBasic text-based graphical configuration\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:110
+#, fuzzy, c-format
+msgid " gconfig\tGTK configuration\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/conf/gnunet-setup.c:111
+#, c-format
 msgid ""
-"USAGE: gnunet-setup MODULE\n"
-"\n"
-"MODULE\n"
-" recreate\trecreate configuration files\n"
-" config\t\ttext-based configuration\n"
-" menuconfig\ttext-based menu\n"
-" gconfig\tGTK configuration\n"
-" wizard-curses\tBasic text-based graphical configuration\n"
 " wizard-gtk\tBasic GTK configuration\n"
 "\n"
 msgstr ""
-"Verwendung: gnunet-setup MODUL\n"
-"\n"
-"MODUL\n"
-" recreate\tKonfigurationsdateien neu erzeugen\n"
-" config\t\tText-basierte Konfiguration\n"
-" menuconfig\tText-basiertes Men�\n"
-" gconfig\tGTK Konfiguration\n"
-" wizard-curses\tEinfache text-basierte grafische Konfiguration\n"
-" wizard-gtk\tEinfache GTK Konfiguration\n"
-"\n"
 
-#: src/conf/gnunet-setup.c:97
-msgid "Please specify a path where the configuration files will be stored."
-msgstr "Bitte geben Sie den Pfad an, wohin die Konfigurationsdateien 
gespeichert werden."
+#: src/conf/gnunet-setup.c:172
+#, fuzzy, c-format
+msgid "gnunet-setup must have write-access to the configuration file '%s'\n"
+msgstr "Konfigurationsdatei '%s' konnte nicht geparst werden.\n"
 
-#: src/conf/gnunet-win-tool.c:108
+#: src/conf/gnunet-setup.c:181 src/server/gnunet-peer-info.c:113
+#: src/server/gnunet-transport-check.c:518 src/server/gnunet-update.c:139
 #, c-format
+msgid "Invalid arguments: "
+msgstr "Ung�ltige Parameter: "
+
+#: src/conf/gnunet-setup.c:223
+#, fuzzy, c-format
+msgid "menuconfig is not available\n"
+msgstr " Transport %d ist nicht verf�gbar\n"
+
+#: src/conf/gnunet-setup.c:228 src/conf/gnunet-setup.c:238
+#, c-format
+msgid ""
+"Can only run wizard to configure gnunetd.\n"
+"Did you forget the '%s' option?\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:233
+#, fuzzy, c-format
+msgid "wizard-curses is not available\n"
+msgstr " Transport %d ist nicht verf�gbar\n"
+
+#: src/conf/gnunet-setup.c:243
+#, fuzzy, c-format
+msgid "wizard-gtk is not available\n"
+msgstr " Transport %d ist nicht verf�gbar\n"
+
+#: src/conf/gnunet-setup.c:250
+#, fuzzy, c-format
+msgid "gconfig is not available\n"
+msgstr " Transport %d ist nicht verf�gbar\n"
+
+#: src/conf/gnunet-setup.c:254
+#, fuzzy, c-format
+msgid "Unknown operation '%s'\n"
+msgstr "Konfigurationsdatei '%s' konnte nicht ge�ffnet werden.\n"
+
+#: src/conf/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:111 src/conf/gnunet-win-tool.c:138
+#: src/conf/gnunet-win-tool.c:112 src/conf/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:115 src/conf/gnunet-win-tool.c:142
+#: 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"
 msgstr "Fehler: der Dienstemanager konnte nicht ge�ffnet werden: %s\n"
 
-#: src/conf/gnunet-win-tool.c:120
+#: src/conf/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:123 src/conf/gnunet-win-tool.c:154
+#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Unbekannter Fehler.\n"
 
-#: src/conf/gnunet-win-tool.c:135
+#: src/conf/gnunet-win-tool.c:136
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Dienst gel�scht.\n"
 
-#: src/conf/gnunet-win-tool.c:147
+#: src/conf/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:151
+#: src/conf/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_callbacks.c:213
-#, c-format
-msgid "Unable to save configuration file %s:"
+#: src/conf/wizard_callbacks.c:169
+#, fuzzy, c-format
+msgid "Unable to save configuration file '%s':"
 msgstr "Fehler beim Speichern der Konfigurationsdatei %s:"
 
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
+#: src/conf/wizard_callbacks.c:189 src/conf/wizard_curs.c:613
 msgid "Unable to create user account:"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
+#: src/conf/wizard_callbacks.c:196 src/conf/wizard_curs.c:616
 msgid "Unable to change startup process:"
 msgstr "Startproze� konnte nicht ge�ndert werden:"
 
-#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
+#: src/conf/wizard_curs.c:57 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:120 src/conf/wizard_util.c:162
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
-#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
-#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
-#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
-#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
-#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
-#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
+#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:128
+#: src/conf/wizard_curs.c:181 src/conf/wizard_curs.c:218
+#: src/conf/wizard_curs.c:248 src/conf/wizard_curs.c:274
+#: src/conf/wizard_curs.c:307 src/conf/wizard_curs.c:334
+#: src/conf/wizard_curs.c:366 src/conf/wizard_curs.c:391
+#: src/conf/wizard_curs.c:420 src/conf/wizard_curs.c:443
+#: src/conf/wizard_curs.c:498 src/conf/wizard_curs.c:560
+#: src/conf/wizard_curs.c:591 src/conf/wizard_curs.c:635
 msgid "GNUnet configuration"
 msgstr "GNUnet Konfiguration"
 
-#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:114
+#, fuzzy
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
-"\thttp://www.gnunet.org\n";
+"\thttp://gnunet.org/\n";
 "and join our community at\n"
-"\thttp://www.gnunet.org/drupal/\n";
+"\thttp://gnunet.org/drupal/\n";
 "\n"
 "Have a lot of fun,\n"
 "\n"
@@ -2270,7 +2593,8 @@
 msgstr ""
 "Willkommen bei GNUnet!\n"
 "\n"
-"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu 
konfigurieren.\n"
+"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu "
+"konfigurieren.\n"
 "\n"
 "Bitte besuchen Sie unsere Homepage\n"
 "\thttp://www.gnunet.org\n";
@@ -2281,94 +2605,156 @@
 "\n"
 "das GNUnet-Team"
 
-#: src/conf/wizard_curs.c:115
-msgid "Choose the network interface that connects your computer to the 
internet from the list below."
-msgstr "W�hlen Sie das Netzwerkger�t, das Ihren Computer mit dem Internet 
verbindet, aus unten stehender Liste."
+#: src/conf/wizard_curs.c:129
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
+msgstr ""
+"W�hlen Sie das Netzwerkger�t, das Ihren Computer mit dem Internet verbindet, "
+"aus unten stehender Liste."
 
-#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
-#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:188
+#: src/conf/wizard_curs.c:225 src/conf/wizard_curs.c:280
+#: src/conf/wizard_curs.c:312 src/conf/wizard_curs.c:372
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
-msgid "The \"Network interface\" is the device that connects your computer to 
the internet. This is usually a modem, an ISDN card or a network card in case 
you are using DSL."
-msgstr "Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem 
Internet verbindet. Dies ist �blicherweise ein Modem, eine ISDN-Karte oder eine 
Netzwerkkarte falls Sie DSL nutzen."
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:189
+msgid ""
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL."
+msgstr ""
+"Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem Internet "
+"verbindet. Dies ist �blicherweise ein Modem, eine ISDN-Karte oder eine "
+"Netzwerkkarte falls Sie DSL nutzen."
 
-#: src/conf/wizard_curs.c:167
-msgid "What is the name of the network interface that connects your computer 
to the Internet?"
-msgstr "Was ist der Name des Netzwerkger�tes, das Ihren Computer mit dem 
Internet verbindet?"
+#: src/conf/wizard_curs.c:182
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
+msgstr ""
+"Was ist der Name des Netzwerkger�tes, das Ihren Computer mit dem Internet "
+"verbindet?"
 
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:219
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
-"Wie hei�t die �ffentliche IP-Adresse oder der �ffentliche Name dieses 
Computers?\n"
+"Wie hei�t die �ffentliche IP-Adresse oder der �ffentliche Name dieses "
+"Computers?\n"
 "Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
 
-#: src/conf/wizard_curs.c:208
+#: src/conf/wizard_curs.c:226
 msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address."
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address."
 msgstr ""
-"Wenn Ihr Provider Ihnen immer die gleiche IP-Adresse zuweist (eine 
\"statische\" IP-Adresse), so geben Sie diese in das \"IP-Adresse\"-Feld ein. 
Wenn sich Ihre IP-Adresse immer wieder �ndert (\"dynamische\" IP-Adresse), es 
jedoch einen Rechnernamen gibt, der immer auf Ihre aktuelle IP-Adresse 
verweist, so k�nnen Sie diesen ebenfalls eintragen.\n"
-"Wenn Sie nicht sicher sind, so k�nnen Sie das Feld leer lassen. GNUnet wird 
dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
+"Wenn Ihr Provider Ihnen immer die gleiche IP-Adresse zuweist (eine "
+"\"statische\" IP-Adresse), so geben Sie diese in das \"IP-Adresse\"-Feld "
+"ein. Wenn sich Ihre IP-Adresse immer wieder �ndert (\"dynamische\" IP-"
+"Adresse), es jedoch einen Rechnernamen gibt, der immer auf Ihre aktuelle IP-"
+"Adresse verweist, so k�nnen Sie diesen ebenfalls eintragen.\n"
+"Wenn Sie nicht sicher sind, so k�nnen Sie das Feld leer lassen. GNUnet wird "
+"dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
 
-#: src/conf/wizard_curs.c:230
+#: src/conf/wizard_curs.c:249
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, say \"yes\" here. Answer \"no\" on direct connections 
through modems, ISDN cards and DNAT (also known as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 "Ist diese Maschine hinter NAT?\n"
 "\n"
-"Wenn Sie mit dem Internet �ber einen anderen Computer per SNAT, einem Router 
oder einer \"Hardware Firewall\" verbunden sind und andere Computer im Internet 
keine Verbindung zu diesem Computer herstellen k�nnen, so sagen Sie hier 
\"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen �ber Modem, 
ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
+"Wenn Sie mit dem Internet �ber einen anderen Computer per SNAT, einem Router "
+"oder einer \"Hardware Firewall\" verbunden sind und andere Computer im "
+"Internet keine Verbindung zu diesem Computer herstellen k�nnen, so sagen Sie "
+"hier \"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen �ber Modem, "
+"ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
 
-#: src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:275
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "Wieviel Upstream (Bytes/s) darf verwendet werden?"
 
-#: src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:280
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"upstream\" is the data channel through which data is *sent* to the 
internet. The limit is either the total maximum for this computer or how much 
GNUnet itself is allowed to use. You can specify that later. If you have a 
flatrate, you can set it to the maximum speed of your internet connection."
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate, you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 "Hier k�nnen Sie GNUnets Ressourcenverwendung einschr�nken.\n"
 "\n"
-"Der \"Upstream\" ist der Datenkanal, durch den Daten an das Internet 
*gesendet* werden. Das Limit ist entweder das gesamte Maximum f�r diesem 
Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter 
festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale 
Geschwindigkeit Ihrer Internetverbindung angeben."
+"Der \"Upstream\" ist der Datenkanal, durch den Daten an das Internet "
+"*gesendet* werden. Das Limit ist entweder das gesamte Maximum f�r diesem "
+"Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter "
+"festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale "
+"Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/conf/wizard_curs.c:287
+#: src/conf/wizard_curs.c:307
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "Wieviel Downstream (Bytes/s) darf verwendet werden?"
 
-#: src/conf/wizard_curs.c:292
+#: src/conf/wizard_curs.c:313
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"downstream\" is the data channel through which data is *received* from 
the internet. The limit is either the total maximum for this computer or how 
much GNUnet itself is allowed to use. You can specify that later. If you have a 
flatrate you can set it to the maximum speed of your internet connection."
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 "Hier k�nnen Sie GNUnets Ressourcenverwendung einschr�nken.\n"
 "\n"
-"Der \"Downstream\" ist der Datenkanal, durch den Daten vom Internet 
*empfangen* werden. Das Limit ist entweder das gesamte Maximum f�r diesem 
Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter 
festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale 
Geschwindigkeit Ihrer Internetverbindung angeben."
+"Der \"Downstream\" ist der Datenkanal, durch den Daten vom Internet "
+"*empfangen* werden. Das Limit ist entweder das gesamte Maximum f�r diesem "
+"Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter "
+"festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale "
+"Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:335
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
-"Say \"yes\" here, if you don't want other network traffic to interfere with 
GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to 
values entered in the previous steps, or if you can't reliably measure the 
maximum capabilities of your connection. \"No\" can be very useful if other 
applications are causing a lot of traffic on your LAN.  In this case, you do 
not want to limit the traffic that GNUnet can inflict on your internet 
connection whenever your high-speed LAN gets used (e.g. by NFS)."
+"Say \"yes\" here, if you don't want other network traffic to interfere with "
+"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
+"values entered in the previous steps, or if you can't reliably measure the "
+"maximum capabilities of your connection. \"No\" can be very useful if other "
+"applications are causing a lot of traffic on your LAN.  In this case, you do "
+"not want to limit the traffic that GNUnet can inflict on your internet "
+"connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 "Angegebene Bandbreite mit anderen Anwendungen teilen?\n"
 "\n"
-"Sagen Sie hier \"Ja\", wenn Sie nicht m�chten, dass anderer Netzwerkverkehr 
GNUnets Funktion st�rt aber dennoch GNUnets Bandbreite gem�� den Angaben in den 
vorherigen Schritten einschr�nken m�chten oder Sie die maximalen M�glichkeiten 
Ihrer Internetverbindung nicht zuverl�ssig messen k�nnen. \"Nein\" kann 
n�tzlich sein, wenn andere Anwendungen viel Netzwerkverkehr in Ihrem LAN 
verursachen. In diesem Fall m�chten Sie nicht GNUnets Netzwerkverkehr �ber die 
Internetverbindung einschr�nken, wann immer Ihre 
Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
+"Sagen Sie hier \"Ja\", wenn Sie nicht m�chten, dass anderer Netzwerkverkehr "
+"GNUnets Funktion st�rt aber dennoch GNUnets Bandbreite gem�� den Angaben in "
+"den vorherigen Schritten einschr�nken m�chten oder Sie die maximalen "
+"M�glichkeiten Ihrer Internetverbindung nicht zuverl�ssig messen k�nnen. "
+"\"Nein\" kann n�tzlich sein, wenn andere Anwendungen viel Netzwerkverkehr in "
+"Ihrem LAN verursachen. In diesem Fall m�chten Sie nicht GNUnets "
+"Netzwerkverkehr �ber die Internetverbindung einschr�nken, wann immer Ihre "
+"Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
 
-#: src/conf/wizard_curs.c:344
+#: src/conf/wizard_curs.c:367
 msgid "How much CPU (in %) may be used?"
 msgstr "Wieviel CPU (in %) darf verwendet werden?"
 
-#: src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:373
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2378,43 +2764,64 @@
 "\n"
 "Dies ist der Prozentsatz an Prozessorzeit, den GNUnet verwenden darf."
 
-#: src/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:392
 msgid ""
 "Store migrated content?\n"
 "\n"
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability."
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability."
 msgstr ""
 "Sollen migrierte Inhalte gespeichert werden?\n"
-"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu 
speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre eingef�gten 
Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten Ihnen geh�ren. Ist 
die \"Inhaltsmigration\" angeschaltet, so k�nnen die Inhalte �ber das Internet 
von einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen \"gewandert\" sein.\n"
-"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu 
verteilen, um so die Verf�gbarkeit zu erh�hen."
+"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu "
+"speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre "
+"eingef�gten Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten "
+"Ihnen geh�ren. Ist die \"Inhaltsmigration\" angeschaltet, so k�nnen die "
+"Inhalte �ber das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr "
+"Wissen \"gewandert\" sein.\n"
+"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu "
+"verteilen, um so die Verf�gbarkeit zu erh�hen."
 
-#: src/conf/wizard_curs.c:395
+#: src/conf/wizard_curs.c:421
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content)."
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content)."
 msgstr ""
 "Was ist die maximale Gr��e des GNUnet Datenspeichers (in MB)?\n"
-"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, 
eingef�gte und migrierte Inhalte)."
+"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, "
+"eingef�gte und migrierte Inhalte)."
 
-#: src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:444
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
-"If you say \"yes\" here, the GNUnet background process will be automatically 
started when you turn on your computer. If you say \"no\" here, you have to 
launch GNUnet yourself each time you want to use it."
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
 "M�chten Sie GNUnet als Systemdienst starten?\n"
 "\n"
-"Wenn Sie hier \"Ja\" sagen, so wird der GNUnet Hintergrundprozess jedesmal 
automatisch gestartet, wenn Sie Ihren Computer einschalten. Wenn Sie hier 
\"Nein\" sagen, so m�ssen Sie GNUnet jedesmal selbst starten, wenn Sie es 
verwenden m�chten."
+"Wenn Sie hier \"Ja\" sagen, so wird der GNUnet Hintergrundprozess jedesmal "
+"automatisch gestartet, wenn Sie Ihren Computer einschalten. Wenn Sie hier "
+"\"Nein\" sagen, so m�ssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
+"verwenden m�chten."
 
-#: src/conf/wizard_curs.c:440
+#: src/conf/wizard_curs.c:499
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account under which the GNUnet service is started at system startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges.\n"
 "\n"
@@ -2422,47 +2829,58 @@
 msgstr ""
 "Geben Sie den Benutzer an, dem der GNUnet Dienst geh�ren soll.\n"
 "\n"
-"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues 
Benutzerkonto anlegen zu lassen, unter dem der GNUnet Dienst beim Systemstart 
l�uft.\n"
+"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues "
+"Benutzerkonto anlegen zu lassen, unter dem der GNUnet Dienst beim "
+"Systemstart l�uft.\n"
 "\n"
-"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies 
betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen 
dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
+"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+"betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen "
+"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
 "\n"
-"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen 
lassen m�chten.\n"
+"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+"lassen m�chten.\n"
 "\n"
 "GNUnet Benutzer:"
 
-#: src/conf/wizard_curs.c:468
+#: src/conf/wizard_curs.c:561
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new group 
for the chosen user account.\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
 "\n"
 "You can also specify a already existant group here.\n"
 "\n"
-"Only members of this group will be allowed to start and stop the the GNUnet 
server and have access to GNUnet server data.\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 "\n"
 "GNUnet group:"
 msgstr ""
 "Definieren Sie eine Gruppe, der der GNUnet Dienst geh�rt.\n"
 "\n"
-"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup eine neue Gruppe 
f�r das gew�hlte Benutzerkonto anlegen zu lassen.\n"
+"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup eine neue Gruppe "
+"f�r das gew�hlte Benutzerkonto anlegen zu lassen.\n"
 "\n"
 "Sie k�nnen hier auch eine bestehende Gruppe angeben.\n"
 "\n"
-"Nur Mitglieder dieser Gruppe d�rfen den GNUnet Server starten und anhalten 
und haben Zugriff auf die Daten des GNUnet Servers.\n"
+"Nur Mitglieder dieser Gruppe d�rfen den GNUnet Server starten und anhalten "
+"und haben Zugriff auf die Daten des GNUnet Servers.\n"
 "\n"
 "GNUnet Gruppe:"
 
-#: src/conf/wizard_curs.c:497
+#: src/conf/wizard_curs.c:592
 msgid ""
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
 "\n"
 "Do you want to start it after saving your configuration?"
 msgstr ""
-"Wenn Sie ein erfahrener Benutzer sind, so m�chten Sie vielleicht Ihre GNUnet 
Installation �ber den erweiterten Konfigurator optimieren.\n"
+"Wenn Sie ein erfahrener Benutzer sind, so m�chten Sie vielleicht Ihre GNUnet "
+"Installation �ber den erweiterten Konfigurator optimieren.\n"
 "\n"
 "M�chten Sie ihn starten, nachdem Ihre Konfiguration gespeichert wurde?"
 
-#: src/conf/wizard_curs.c:576
+#: src/conf/wizard_curs.c:629
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -2479,6 +2897,36 @@
 msgid "GNUnet configuration assistant"
 msgstr "GNUnet Konfigurationsassistent"
 
+#: src/conf/wizard_interface.c:77
+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://www.gnunet.org\n";
+"and join our community at\n"
+"\thttp://www.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://www.gnunet.org\n";
+"und schlie�en Sie sich unserer Community an:\n"
+"\thttp://www.gnunet.org/drupal/\n";
+"\n"
+"Viel Spa�,\n"
+"\n"
+"das GNUnet-Team"
+
 #: src/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
 #: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
 msgid "Next"
@@ -2494,21 +2942,45 @@
 msgid ""
 "Enter information about your network connection here.\n"
 "\n"
-"The \"Network interface\" is the device that connects your computer to the 
internet. This is usually a modem, an ISDN card or a network card in case you 
are using DSL.\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
 "\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
 msgstr ""
 "Geben Sie hier Ihre Netzwerkinformationen ein.\n"
 "\n"
-"Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem Internet 
verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine 
Netzwerkkarte f�r den Fall, dass Sie DSL benutzen.\n"
+"Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem Internet "
+"verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine "
+"Netzwerkkarte f�r den Fall, dass Sie DSL benutzen.\n"
 "\n"
-"Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine 
\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld ein. Wenn 
Ihre IP-Adresse sich hin und wieder �ndert (\"dynamische\" IP-Adresse), es 
jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-Adresse zeigt 
(\"Dynamisches DNS\"), so k�nnen Sie ihn auch eingeben.\n"
-"Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die 
IP-Adresse automatisch zu bestimmen.\n"
+"Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine "
+"\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld ein. "
+"Wenn Ihre IP-Adresse sich hin und wieder �ndert (\"dynamische\" IP-Adresse), "
+"es jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-Adresse zeigt "
+"(\"Dynamisches DNS\"), so k�nnen Sie ihn auch eingeben.\n"
+"Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die IP-"
+"Adresse automatisch zu bestimmen.\n"
 "\n"
-"Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies �ber 
einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware Firewall\" 
geschieht und andere Computer im Internet keine Verbindung mit diesem Computer 
herstellen k�nnen, so aktivieren Sie die letzte Option auf dieser Seite. Lassen 
Sie sie jedoch deaktiviert, wenn Sie eine direkte Verbindung �ber ein Modem, 
eine ISDN-Karte oder einen anderen Rechner mit DNAT (auch bekannt als \"Port 
forwarding\") zum Internet haben."
+"Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies �ber "
+"einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware Firewall"
+"\" geschieht und andere Computer im Internet keine Verbindung mit diesem "
+"Computer herstellen k�nnen, so aktivieren Sie die letzte Option auf dieser "
+"Seite. Lassen Sie sie jedoch deaktiviert, wenn Sie eine direkte Verbindung "
+"�ber ein Modem, eine ISDN-Karte oder einen anderen Rechner mit DNAT (auch "
+"bekannt als \"Port forwarding\") zum Internet haben."
 
 #: src/conf/wizard_interface.c:251
 msgid "Network interface:"
@@ -2520,7 +2992,8 @@
 
 #: src/conf/wizard_interface.c:273
 msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-msgstr "Computer kann keine ankommenden Verbindungen akzeptieren 
(SNAT/Firewall)"
+msgstr ""
+"Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
 
 #: src/conf/wizard_interface.c:285
 msgid "Network connection"
@@ -2535,15 +3008,22 @@
 msgid ""
 "You can limit GNUnet's ressource usage here.\n"
 "\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you have 
a flatrate you can set it to the maximum speed of your internet connection.\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
 "\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed 
to use."
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
 msgstr ""
 "Hier k�nnen Sie GNUnet's Ressourcennutzung einschr�nken.\n"
 "\n"
-"\"Bandbreitenbeschr�nkung\" gibt an, wieviele Daten maximal pro Sekunde 
�betragen werden d�rfen. Wenn Sie eine Flatrate haben, k�nnen Sie diese Werte 
auf die maximal erreichbare Geschwindigkeit Ihrer Internetverbindung setzen.\n"
+"\"Bandbreitenbeschr�nkung\" gibt an, wieviele Daten maximal pro Sekunde "
+"�betragen werden d�rfen. Wenn Sie eine Flatrate haben, k�nnen Sie diese "
+"Werte auf die maximal erreichbare Geschwindigkeit Ihrer Internetverbindung "
+"setzen.\n"
 "\n"
-"Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet f�r 
sich verwenden darf."
+"Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet f�r "
+"sich verwenden darf."
 
 #: src/conf/wizard_interface.c:521
 msgid "Upstream (Bytes/s):"
@@ -2583,19 +3063,35 @@
 
 #: src/conf/wizard_interface.c:814
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability.\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
 "\n"
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator."
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator."
 msgstr ""
-"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu 
speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre eingef�gten 
Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten Ihnen geh�ren. Mit 
\"Inhaltsmigration\" angeschaltet k�nnen die Inhalte �ber das Internet von 
einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen \"gewandert\" sein.\n"
-"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu 
verteilen, um so die Verf�gbarkeit zu erh�hen.\n"
+"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu "
+"speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre "
+"eingef�gten Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten "
+"Ihnen geh�ren. Mit \"Inhaltsmigration\" angeschaltet k�nnen die Inhalte �ber "
+"das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen "
+"\"gewandert\" sein.\n"
+"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu "
+"verteilen, um so die Verf�gbarkeit zu erh�hen.\n"
 "\n"
-"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, 
eingef�gte und migrierte Inhalte). Seine maximale Gr��e kann unten angegeben 
werden.\n"
+"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, "
+"eingef�gte und migrierte Inhalte). Seine maximale Gr��e kann unten angegeben "
+"werden.\n"
 "\n"
-"Wenn Sie ein fortgeschrittener Benutzer sind, m�chten Sie vielleicht weitere 
Feinjustierungen an GNUnet �ber den \"erweiterten Konfigurator\" vornehmen."
+"Wenn Sie ein fortgeschrittener Benutzer sind, m�chten Sie vielleicht weitere "
+"Feinjustierungen an GNUnet �ber den \"erweiterten Konfigurator\" vornehmen."
 
 #: src/conf/wizard_interface.c:829
 msgid "Store migrated content"
@@ -2607,7 +3103,8 @@
 
 #: src/conf/wizard_interface.c:849
 msgid "Start the GNUnet background process on computer startup"
-msgstr "GNUnet Hintergrundproze� beim Starten des Computers automatisch 
starten"
+msgstr ""
+"GNUnet Hintergrundproze� beim Starten des Computers automatisch starten"
 
 #: src/conf/wizard_interface.c:856
 msgid "Open the enhanced configurator"
@@ -2649,19 +3146,29 @@
 msgid ""
 "Define the user and the group owning the GNUnet service here.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account and a new group under which the GNUnet service is started at system 
startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges."
 msgstr ""
-"Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst geh�ren 
soll.\n"
+"Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst geh�ren "
+"soll.\n"
 "\n"
-"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues 
Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der GNUnet 
Dienst beim Systemstart l�uft.\n"
+"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues "
+"Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der GNUnet "
+"Dienst beim Systemstart l�uft.\n"
 "\n"
-"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies 
betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen 
dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
+"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+"betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen "
+"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
 "\n"
-"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen 
lassen m�chten."
+"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+"lassen m�chten."
 
 #: src/conf/wizard_interface.c:1209
 msgid "Group:"
@@ -2691,31 +3198,31 @@
 msgid "Can't access the service"
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/conf/wizard_util.c:111
+#: src/conf/wizard_util.c:112
 msgid "Can't delete the service"
 msgstr "Dienst konnte nicht gel�scht werden"
 
-#: src/conf/wizard_util.c:114
+#: src/conf/wizard_util.c:116
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/conf/wizard_util.c:143
+#: src/conf/wizard_util.c:145
 msgid "This version of Windows does not support multiple users."
 msgstr "Diese Version von Windows ist nicht Mehrbenutzerf�hig."
 
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:149
 msgid "Error creating user"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:152
 msgid "Error accessing local security policy"
 msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
 
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:155
 msgid "Error granting service right to user"
 msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
 
-#: src/conf/wizard_util.c:156
+#: src/conf/wizard_util.c:158
 msgid "Unknown error while creating a new user"
 msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
 
@@ -2729,41 +3236,42 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: L�nge %d, Priorit�t: %d\n"
 
-#: src/server/connection.c:2155
+#: src/server/connection.c:2192
 #, c-format
 msgid "Message from '%s' discarded: invalid format.\n"
 msgstr "Nachricht von '%s' verworfen: ung�ltiges Format.\n"
 
-#: src/server/connection.c:2232
+#: src/server/connection.c:2269
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Ung�ltige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2248
+#: src/server/connection.c:2285
 msgid "Message received more than one day old. Dropped.\n"
-msgstr "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird 
verworfen.\n"
+msgstr ""
+"Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2641
+#: src/server/connection.c:2679
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2643
+#: src/server/connection.c:2681
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2645
+#: src/server/connection.c:2683
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:2647
+#: src/server/connection.c:2685
 msgid "# bytes encrypted"
 msgstr "# Bytes verschl�sselt"
 
-#: src/server/connection.c:2649
+#: src/server/connection.c:2687
 msgid "# bytes decrypted"
 msgstr "# Bytes entschl�sselt"
 
-#: src/server/connection.c:2651
+#: src/server/connection.c:2689
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
@@ -2785,7 +3293,9 @@
 #: src/server/core.c:221
 #, c-format
 msgid "Could not shutdown application '%s': not initialized\n"
-msgstr "Anwendung '%s' kann nicht heruntergefahren werden: sie ist nicht 
initialisiert\n"
+msgstr ""
+"Anwendung '%s' kann nicht heruntergefahren werden: sie ist nicht "
+"initialisiert\n"
 
 #: src/server/core.c:230 src/server/core.c:419
 #, c-format
@@ -2824,12 +3334,6 @@
 msgid "Print information about GNUnet peers."
 msgstr "Informationen �ber andere GNUnet Knoten ausgeben."
 
-#: src/server/gnunet-peer-info.c:113 src/server/gnunet-transport-check.c:518
-#: src/server/gnunet-update.c:139
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Ung�ltige Parameter: "
-
 #: 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"
@@ -2871,8 +3375,11 @@
 
 #: src/server/gnunet-transport-check.c:188
 #, c-format
-msgid "'%s' transport OK.  It took %ums to transmit %d messages of %d bytes 
each.\n"
-msgstr "'%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je 
%d Bytes zu �bertragen.\n"
+msgid ""
+"'%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+msgstr ""
+"'%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
+"Bytes zu �bertragen.\n"
 
 #: src/server/gnunet-transport-check.c:221
 #, c-format
@@ -2925,11 +3432,14 @@
 
 #: src/server/gnunet-transport-check.c:500
 msgid "Tool to test if GNUnet transport services are operational."
-msgstr "Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport 
Dienste funktionsf�hig sind."
+msgstr ""
+"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
+"funktionsf�hig sind."
 
 #: src/server/gnunet-transport-check.c:548
 msgid "You must specify a non-empty set of transports to test!\n"
-msgstr "Sie m�ssen eine Menge an Transporten angeben, die getestet werden 
sollen!\n"
+msgstr ""
+"Sie m�ssen eine Menge an Transporten angeben, die getestet werden sollen!\n"
 
 #: src/server/gnunet-transport-check.c:553
 #, c-format
@@ -2943,16 +3453,22 @@
 
 #: src/server/gnunet-transport-check.c:600
 #, c-format
-msgid "%d out of %d peers contacted successfully (%d times transport 
unavailable).\n"
-msgstr "%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport 
nicht verf�gbar).\n"
+msgid ""
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
+msgstr ""
+"%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
+"verf�gbar).\n"
 
 #: src/server/gnunet-update.c:49
 msgid "print a value from the configuration file to stdout"
-msgstr "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe 
ausgeben"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
 #: src/server/gnunet-update.c:53
 msgid "run in user mode (for getting user configuration values)"
-msgstr "Im Benuter-Modus laufen (um benutzerspezifische 
Konfigurationseinstellungen zu bekommen)"
+msgstr ""
+"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
+"zu bekommen)"
 
 #: src/server/gnunet-update.c:59
 msgid "Updates GNUnet datastructures after version change."
@@ -2987,27 +3503,29 @@
 msgid "Updated data for %d applications.\n"
 msgstr "Daten f�r %d Anwendungen wurden aktualisiert.\n"
 
-#: src/server/gnunetd.c:108
+#: src/server/gnunetd.c:115
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run '%s'!\n"
-msgstr "Konfiguration oder die GNUnet Version hat sich ge�ndert. Sie m�ssen 
'%s' ausf�hren!\n"
+msgstr ""
+"Konfiguration oder die GNUnet Version hat sich ge�ndert. Sie m�ssen '%s' "
+"ausf�hren!\n"
 
-#: src/server/gnunetd.c:116
+#: src/server/gnunetd.c:123
 #, c-format
 msgid "'%s' starting\n"
 msgstr "'%s' startet\n"
 
-#: src/server/gnunetd.c:138
+#: src/server/gnunetd.c:145
 #, c-format
 msgid "'%s' startup complete.\n"
 msgstr "'%s' Startvorgang abgeschlossen.\n"
 
-#: src/server/gnunetd.c:143
+#: src/server/gnunetd.c:150
 #, c-format
 msgid "'%s' is shutting down.\n"
 msgstr "'%s' f�hrt herunter.\n"
 
-#: src/server/handler.c:366
+#: 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"
@@ -3020,7 +3538,9 @@
 #: src/server/startup.c:268
 #, c-format
 msgid "You must specify a name for the PID file in section '%s' under '%s'.\n"
-msgstr "Sie m�ssen einen Namen f�r die PID Datei in Sektion '%s' unter '%s' 
angeben.\n"
+msgstr ""
+"Sie m�ssen einen Namen f�r die PID Datei in Sektion '%s' unter '%s' "
+"angeben.\n"
 
 #: src/server/startup.c:283
 #, c-format
@@ -3028,8 +3548,13 @@
 msgstr "PID konnte nicht in Datei '%s' geschrieben werden: %s.\n"
 
 #: src/server/startup.c:387
-msgid "run in debug mode; gnunetd will not daemonize and error messages will 
be written to stderr instead of a logfile"
-msgstr "Im Debug-Modus ausf�hren. gnunetd wird nicht im Hintergrund laufen und 
Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die 
Standardfehlerausgabe (stderr) geschrieben."
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
+msgstr ""
+"Im Debug-Modus ausf�hren. gnunetd wird nicht im Hintergrund laufen und "
+"Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
+"Standardfehlerausgabe (stderr) geschrieben."
 
 #: src/server/startup.c:393
 msgid "run as user LOGIN"
@@ -3039,26 +3564,26 @@
 msgid "Starts the gnunetd daemon."
 msgstr "Startet den gnunetd Daemonen."
 
-#: src/server/startup.c:488
-#, c-format
-msgid "User '%s' not known, cannot change UID to it."
+#: src/server/startup.c:412
+#, fuzzy, c-format
+msgid "User '%s' not known, cannot change UID to it.\n"
 msgstr "Benutzer '%s' ist nicht bekannt, UID kann nicht gewechselt werden."
 
-#: src/server/startup.c:499
-#, c-format
-msgid "Cannot change user/group to '%s': %s"
+#: src/server/startup.c:421
+#, fuzzy, c-format
+msgid "Cannot change user/group to '%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu '%s' gewechselt werden: %s"
 
-#: src/server/startup.c:518
+#: src/server/startup.c:522
 msgid "Invalid command-line arguments:\n"
 msgstr "Ung�ltige Kommandozeilen Parameter:\n"
 
-#: src/server/startup.c:521
+#: src/server/startup.c:525
 #, c-format
 msgid "Argument %d: '%s'\n"
 msgstr "Parameter %d: '%s'\n"
 
-#: src/server/startup.c:527
+#: src/server/startup.c:531
 msgid "Invalid command-line arguments.\n"
 msgstr "Ung�ltige Kommandozeilen Parameter.\n"
 
@@ -3069,10 +3594,14 @@
 
 #: src/server/tcpserver.c:696
 #, c-format
-msgid "Malformed network specification in the configuration in section '%s' 
for entry '%s': %s\n"
-msgstr "Besch�digte Netzwerkangabe in der Konfigurationsdatei in Sektion '%s' 
f�r Eintrag '%s': %s\n"
+msgid ""
+"Malformed network specification in the configuration in section '%s' for "
+"entry '%s': %s\n"
+msgstr ""
+"Besch�digte Netzwerkangabe in der Konfigurationsdatei in Sektion '%s' f�r "
+"Eintrag '%s': %s\n"
 
-#: src/server/tcpserver.c:802
+#: src/server/tcpserver.c:806
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
@@ -3093,18 +3622,21 @@
 
 #: 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"
+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:689 src/transports/udp.c:286
+#: src/transports/http.c:817 src/transports/tcp.c:692 src/transports/udp.c:286
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-msgstr "%s: Abgewiesene Verbindung von schwarzgelisteter Adresse 
%u.%u.%u.%u.\n"
+msgstr ""
+"%s: Abgewiesene Verbindung von schwarzgelisteter Adresse %u.%u.%u.%u.\n"
 
 #: src/transports/http.c:1099
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: �ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1132 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -3112,8 +3644,11 @@
 
 #: src/transports/http.c:1329
 #, c-format
-msgid "Could not bind the HTTP listener to port %d. No transport service 
started.\n"
-msgstr "HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport 
Dienst wurde nicht gestartet.\n"
+msgid ""
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
+msgstr ""
+"HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
+"wurde nicht gestartet.\n"
 
 #: src/transports/http.c:1472
 msgid "# bytes received via HTTP"
@@ -3134,16 +3669,23 @@
 
 #: src/transports/smtp.c:415
 #, c-format
-msgid "You must specify the name of a pipe for the SMTP transport in section 
'%s' under '%s'.\n"
-msgstr "F�r den SMTP Transport m�ssen Sie den Namen einer Pipe in Sektion 
'%s', Eintrag '%s' eintragen.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section '%s' "
+"under '%s'.\n"
+msgstr ""
+"F�r den SMTP Transport m�ssen Sie den Namen einer Pipe in Sektion '%s', "
+"Eintrag '%s' eintragen.\n"
 
 #: src/transports/smtp.c:484
 msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr "Es wurde eine ung�ltige Nachricht per SMTP empfangen (ung�ltige 
Gr��e).\n"
+msgstr ""
+"Es wurde eine ung�ltige Nachricht per SMTP empfangen (ung�ltige Gr��e).\n"
 
 #: src/transports/smtp.c:571
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr "Kein Filter f�r E-Mail angegeben, es kann keine Bekanntmachung 
erstellt werden.\n"
+msgstr ""
+"Kein Filter f�r E-Mail angegeben, es kann keine Bekanntmachung erstellt "
+"werden.\n"
 
 #: src/transports/smtp.c:578
 #, c-format
@@ -3169,46 +3711,59 @@
 #: src/transports/udp6.c:636
 #, c-format
 msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
-msgstr "MTU f�r '%s' ist m�glicherweise zu gering (Fragmentierung ist nicht 
implementiert!)\n"
+msgstr ""
+"MTU f�r '%s' ist m�glicherweise zu gering (Fragmentierung ist nicht "
+"implementiert!)\n"
 
 #: src/transports/tcp.c: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 ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, �ber die TCP Verbindung wurde "
+"aber keine gesendet (%u, %u). Verbindung wird geschlossen.\n"
 
 #: src/transports/tcp.c: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 ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
+msgstr ""
+"Es wurde per TCP von einem anderen Knoten eine ung�ltige Nachricht (Gr��e %"
+"u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/tcp.c:1057
+#: src/transports/tcp.c:1064
 msgid "Could not determine my public IP address.\n"
 msgstr "�ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:1314 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/transports/tcp.c:1424
+#: src/transports/tcp.c:1431
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen �ber TCP"
 
-#: src/transports/tcp.c:1426
+#: src/transports/tcp.c:1433
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet �ber TCP"
 
-#: src/transports/tcp.c:1428
+#: src/transports/tcp.c:1435
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
 #: 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"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, �ber die TCP Verbindung wurde "
+"jedoch keine gesendet. Verbindung wird geschlossen.\n"
 
 #: src/transports/tcp6.c:469
-msgid "Received malformed message from tcp6-peer connection. Closing 
connection.\n"
-msgstr "�ber die TCP6-Verbindung zu einem anderen Knoten wurde eine ung�ltige 
Nachricht empfangen. Verbindung wird geschlossen.\n"
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr ""
+"�ber die TCP6-Verbindung zu einem anderen Knoten wurde eine ung�ltige "
+"Nachricht empfangen. Verbindung wird geschlossen.\n"
 
 #: src/transports/tcp6.c:657 src/transports/udp6.c:274
 #, c-format
@@ -3226,8 +3781,13 @@
 
 #: 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 "Port konnte nicht ermittelt werden. Bitte definieren Sie ihn in der 
Konfigurationsdatei in der Sektion '%s' unter '%s' oder in '%s' unter %s/%s.\n"
+msgid ""
+"Cannot determine port to bind to.  Define in configuration file in section '%"
+"s' under '%s' or in '%s' under %s/%s.\n"
+msgstr ""
+"Port konnte nicht ermittelt werden. Bitte definieren Sie ihn in der "
+"Konfigurationsdatei in der Sektion '%s' unter '%s' oder in '%s' unter %s/%"
+"s.\n"
 
 #: src/transports/udp.c:179
 #, c-format
@@ -3237,12 +3797,15 @@
 #: src/transports/udp.c:252
 #, c-format
 msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr "Es wurde eine ung�ltige UDP Nachricht von %u.%u.%u.%u:%u empfangen, 
Nachricht wird ignoriert.\n"
+msgstr ""
+"Es wurde eine ung�ltige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
+"Nachricht wird ignoriert.\n"
 
 #: src/transports/udp.c:275
 #, c-format
 msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr "Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ung�ltiges 
Format.\n"
+msgstr ""
+"Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ung�ltiges Format.\n"
 
 #: src/transports/udp.c:356
 msgid "UDP: Could not determine my public IP address.\n"
@@ -3251,7 +3814,9 @@
 #: src/transports/udp.c:488
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr "Eine Nachricht der Gr��e %d konnte nicht per UDP an %u.%u.%u.%u:%u 
versendet werden: %s\n"
+msgstr ""
+"Eine Nachricht der Gr��e %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
+"werden: %s\n"
 
 #: src/transports/udp.c:643
 msgid "# bytes received via UDP"
@@ -3267,13 +3832,18 @@
 
 #: src/transports/ip.c:141
 #, c-format
-msgid "Could not find interface '%s' in '%s', trying to find another 
interface.\n"
-msgstr "Ger�t '%s' konnte in '%s' nicht gefunden werden, es wird versucht, ein 
anderes Ger�t zu finden.\n"
+msgid ""
+"Could not find interface '%s' in '%s', trying to find another interface.\n"
+msgstr ""
+"Ger�t '%s' konnte in '%s' nicht gefunden werden, es wird versucht, ein "
+"anderes Ger�t zu finden.\n"
 
 #: src/transports/ip.c:166
 #, c-format
 msgid "Could not obtain IP for interface '%s' using '%s'.\n"
-msgstr "Es konnte keine IP f�r das Ger�t '%s' unter Verwendung von '%s' 
ermittelt werden.\n"
+msgstr ""
+"Es konnte keine IP f�r das Ger�t '%s' unter Verwendung von '%s' ermittelt "
+"werden.\n"
 
 #: src/transports/ip.c:210
 #, c-format
@@ -3292,7 +3862,8 @@
 #: src/transports/ip.c:241
 #, c-format
 msgid "Could not resolve '%s' to determine our IP address: %s\n"
-msgstr "'%s' konnte nicht aufgel�st werden, um unsere IP-Adresse zu ermitteln: 
%s\n"
+msgstr ""
+"'%s' konnte nicht aufgel�st werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
 #: src/transports/ip.c:274
 #, c-format
@@ -3311,12 +3882,15 @@
 #: src/transports/udp6.c:234
 #, c-format
 msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Ung�ltige UDP6 Nachricht von %s:%d empfangen, Nachricht wird 
ignoriert.\n"
+msgstr ""
+"Ung�ltige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
 
 #: src/transports/udp6.c:263
 #, c-format
 msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr "Die Format�berpr�fung des Pakets, das von %s:%d (UDP6) empfangen 
wurde, schlug fehl."
+msgstr ""
+"Die Format�berpr�fung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
+"schlug fehl."
 
 #: src/transports/udp6.c:353
 msgid "UDP6: Could not determine my public IPv6 address.\n"
@@ -3337,14 +3911,14 @@
 msgid "Syntax error in configuration file '%s' at line %d.\n"
 msgstr "Syntaxfehler in Konfigurationsdatei '%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:471
+#: src/util/configuration.c:509 src/util/configuration.c:511
 #, c-format
-msgid "Configuration file '%s' not found. I will try to create the default 
configuration file at that location.\n"
-msgstr "Konfigurationsdatei '%s' wurde nicht gefunden. Es wird versucht, an 
dieser Stelle eine Standardkonfigurationsdatei anzulegen.\n"
+msgid "Configuration file '%s' not found.  Run gnunet-setup!\n"
+msgstr ""
 
-#: src/util/configuration.c:488
-#, c-format
-msgid "Cannot open configuration file '%s'\n"
+#: src/util/configuration.c:515
+#, fuzzy, c-format
+msgid "Cannot open configuration file '%s'.\n"
 msgstr "Konfigurationsdatei '%s' konnte nicht ge�ffnet werden.\n"
 
 #: src/util/cron.c:229
@@ -3353,8 +3927,12 @@
 
 #: src/util/cron.c:366
 #, c-format
-msgid "'%s' called with cron job not in queue, adding.  This may not be what 
you want.\n"
-msgstr "'%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird 
hinzugef�gt. Das ist m�glicherweise nicht, was Sie wollen.\n"
+msgid ""
+"'%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
+msgstr ""
+"'%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird hinzugef�gt. "
+"Das ist m�glicherweise nicht, was Sie wollen.\n"
 
 #: src/util/dso.c:42
 #, c-format
@@ -3369,7 +3947,8 @@
 #: src/util/dso.c:144
 #, c-format
 msgid "'%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr "'%s' konnte die Methode '%s%s' nicht aufl�sen. Ort: %s:%d. Fehler: 
%s\n"
+msgstr ""
+"'%s' konnte die Methode '%s%s' nicht aufl�sen. Ort: %s:%d. Fehler: %s\n"
 
 #: src/util/getopt.c:641
 #, c-format
@@ -3431,7 +4010,7 @@
 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:151
+#: src/util/initialize.c:228
 msgid "Shutdown complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
@@ -3443,7 +4022,8 @@
 #: src/util/random.c:38
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt hat nicht die erwartete Version (Version %s wird 
vorausgesetzt).\n"
+msgstr ""
+"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
 #: src/util/ipcheck.c:100
 #, c-format
@@ -3527,8 +4107,12 @@
 
 #: src/util/port.c:45
 #, c-format
-msgid "Cannot determine port of gnunetd server. Define in configuration file 
in section '%s' under '%s'.\n"
-msgstr "Der Port des gnunetd Servers konnte nicht ermittelt werden. Definieren 
Sie ihn in der Sektion '%s' unter '%s'.\n"
+msgid ""
+"Cannot determine port of gnunetd server. Define in configuration file in "
+"section '%s' under '%s'.\n"
+msgstr ""
+"Der Port des gnunetd Servers konnte nicht ermittelt werden. Definieren Sie "
+"ihn in der Sektion '%s' unter '%s'.\n"
 
 #: src/util/printhelp.c:42
 #, c-format
@@ -3543,8 +4127,11 @@
 
 #: src/util/printhelp.c:45
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Parameter, die f�r lange Optionen zwingend sind, sind auch f�r kurze 
Optionen zwingend.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Parameter, die f�r lange Optionen zwingend sind, sind auch f�r kurze "
+"Optionen zwingend.\n"
 
 #: src/util/semaphore.c:172 src/util/semaphore.c:198
 #, c-format
@@ -3568,8 +4155,12 @@
 
 #: src/util/state.c:86
 #, c-format
-msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s\\%s.\n"
-msgstr "Die Konfigurationsdatei muss unter %s\\%s ein Verzeichnis f�r GNUnet 
angeben, in dem knotenbezogene Daten gespeichert werden.\n"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
+msgstr ""
+"Die Konfigurationsdatei muss unter %s\\%s ein Verzeichnis f�r GNUnet "
+"angeben, in dem knotenbezogene Daten gespeichert werden.\n"
 
 #: src/util/statuscalls.c:185
 #, c-format
@@ -3586,8 +4177,11 @@
 
 #: 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"
+msgid ""
+"No network interfaces defined in configuration section '%s' under '%s'!\n"
+msgstr ""
+"Es sind keine Netzwerkger�te in der Konfigurationsdatei in der Sektion '%s' "
+"unter '%s' definiert!\n"
 
 #: src/util/storage.c:196
 #, c-format
@@ -3673,12 +4267,47 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
-#: src/include/gnunet_util.h:1036
+#: src/include/gnunet_util.h:1041 src/include/gnunet_util.h:1043
+#: src/include/gnunet_util.h:1050
 #, 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 ""
+#~ "USAGE: gnunet-setup MODULE\n"
+#~ "\n"
+#~ "MODULE\n"
+#~ " recreate\trecreate configuration files\n"
+#~ " config\t\ttext-based configuration\n"
+#~ " menuconfig\ttext-based menu\n"
+#~ " gconfig\tGTK configuration\n"
+#~ " wizard-curses\tBasic text-based graphical configuration\n"
+#~ " wizard-gtk\tBasic GTK configuration\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Verwendung: gnunet-setup MODUL\n"
+#~ "\n"
+#~ "MODUL\n"
+#~ " recreate\tKonfigurationsdateien neu erzeugen\n"
+#~ " config\t\tText-basierte Konfiguration\n"
+#~ " menuconfig\tText-basiertes Men�\n"
+#~ " gconfig\tGTK Konfiguration\n"
+#~ " wizard-curses\tEinfache text-basierte grafische Konfiguration\n"
+#~ " wizard-gtk\tEinfache GTK Konfiguration\n"
+#~ "\n"
+
+#~ msgid "Please specify a path where the configuration files will be stored."
+#~ msgstr ""
+#~ "Bitte geben Sie den Pfad an, wohin die Konfigurationsdateien gespeichert "
+#~ "werden."
+
+#~ msgid ""
+#~ "Configuration file '%s' not found. I will try to create the default "
+#~ "configuration file at that location.\n"
+#~ msgstr ""
+#~ "Konfigurationsdatei '%s' wurde nicht gefunden. Es wird versucht, an "
+#~ "dieser Stelle eine Standardkonfigurationsdatei anzulegen.\n"
+
 #~ msgid "# client trace requests received"
 #~ msgstr "# Client Trace-Anfragen empfangen"
 
@@ -3692,16 +4321,26 @@
 #~ msgstr "# p2p Trace-Antworten gesendet"
 
 #~ msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
-#~ msgstr "Sitzung mit Knoten '%s' ist best�tigt es kann jedoch nicht 
verbunden werden! (Bug?)\n"
+#~ msgstr ""
+#~ "Sitzung mit Knoten '%s' ist best�tigt es kann jedoch nicht verbunden "
+#~ "werden! (Bug?)\n"
 
 #~ msgid "LOGLEVEL not specified, that is not ok.\n"
 #~ msgstr "LOGLEVEL wurde nicht angegeben, das ist nicht in Ordnung.\n"
 
-#~ msgid "Interfaces string (%s) in configuration section '%s' under '%s' is 
malformed.\n"
-#~ msgstr "Ger�teangabe (%s) in der Konfigurationssektion '%s' unter '%s' ist 
besch�digt.\n"
+#~ msgid ""
+#~ "Interfaces string (%s) in configuration section '%s' under '%s' is "
+#~ "malformed.\n"
+#~ msgstr ""
+#~ "Ger�teangabe (%s) in der Konfigurationssektion '%s' unter '%s' ist "
+#~ "besch�digt.\n"
 
-#~ msgid "No network interfaces specified in the configuration file in section 
'%s' under '%s'.\n"
-#~ msgstr "Es sind keine Netzwerkger�te in der Konfigurationsdatei in der 
Sektion '%s' unter '%s' definiert.\n"
+#~ msgid ""
+#~ "No network interfaces specified in the configuration file in section '%s' "
+#~ "under '%s'.\n"
+#~ msgstr ""
+#~ "Es sind keine Netzwerkger�te in der Konfigurationsdatei in der Sektion '%"
+#~ "s' unter '%s' definiert.\n"
 
 #~ msgid "Failed to parse interface data '%s' output at %s:%d.\n"
 #~ msgstr "Fehler beim Parsen der Ger�tedaten '%s' Ausgabe bei %s:%d.\n"
@@ -3709,17 +4348,24 @@
 #~ msgid "Could not decoding file '%s' at %s:%d.\n"
 #~ msgstr "Datei '%s' konnte nicht dekodiert werden bei %s:%d.\n"
 
-#~ msgid "Configuration file must specify directory for network identities in 
section %s under %s.\n"
-#~ msgstr "Die Konfigurationsdatei muss in Sektion %s unter %s ein Verzeichnis 
f�r Identit�ten angeben.\n"
+#~ msgid ""
+#~ "Configuration file must specify directory for network identities in "
+#~ "section %s under %s.\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in Sektion %s unter %s ein Verzeichnis f�r "
+#~ "Identit�ten angeben.\n"
 
 #~ msgid "Sender %u.%u.%u.%u is blacklisted, dropping message.\n"
-#~ msgstr "Sender %u.%u.%u.%u steht auf schwarzer Liste, Nachricht wird 
ignoriert.\n"
+#~ msgstr ""
+#~ "Sender %u.%u.%u.%u steht auf schwarzer Liste, Nachricht wird ignoriert.\n"
 
 #~ msgid "Sender %s is blacklisted, dropping message.\n"
 #~ msgstr "Sender %s steht auf schwarzer Liste, Nachricht wird ignoriert.\n"
 
 #~ msgid "Removed file '%s' containing invalid peer advertisement.\n"
-#~ msgstr "Datei '%s' enthielt eine ung�ltige Knotenbekanntmachung und wurde 
entfernt.\n"
+#~ msgstr ""
+#~ "Datei '%s' enthielt eine ung�ltige Knotenbekanntmachung und wurde "
+#~ "entfernt.\n"
 
 #~ msgid "Removed invalid HELO file '%s'\n"
 #~ msgstr "Ung�ltige HELO Datei '%s' wurde entfernt.\n"
@@ -3728,13 +4374,22 @@
 #~ msgstr "IP-Adresse der lokalen Maschiene konnte nicht ermittelt werden!\n"
 
 #~ msgid "Could not determine IP(v6) address of the local machine!\n"
-#~ msgstr "IP(v6)-Adresse der lokalen Maschiene konnte nicht ermittelt 
werden!\n"
+#~ msgstr ""
+#~ "IP(v6)-Adresse der lokalen Maschiene konnte nicht ermittelt werden!\n"
 
-#~ msgid "Could not find IP(v4) for this host. Please provide the IP in the 
configuration file.\n"
-#~ msgstr "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie 
die IP in der Konfigurationsdatei an.\n"
+#~ msgid ""
+#~ "Could not find IP(v4) for this host. Please provide the IP in the "
+#~ "configuration file.\n"
+#~ msgstr ""
+#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
 
-#~ msgid "Could not find IP(v6) for this host. Please provide the IP in the 
configuration file.\n"
-#~ msgstr "IP(v6) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie 
die IP in der Konfigurationsdatei an.\n"
+#~ msgid ""
+#~ "Could not find IP(v6) for this host. Please provide the IP in the "
+#~ "configuration file.\n"
+#~ msgstr ""
+#~ "IP(v6) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
 
 #~ msgid "'%s' failed: %s\n"
 #~ msgstr "'%s' schlug fehl: %s\n"

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2005-08-18 03:56:29 UTC (rev 1728)
+++ GNUnet/po/rw.po     2005-08-18 03:59:07 UTC (rev 1729)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-18 01:09+0200\n"
+"POT-Creation-Date: 2005-08-17 21:04-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"
@@ -80,7 +80,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:726
-#: src/applications/session/connect.c:735
+#: src/applications/session/connect.c:749
 #, c-format
 msgid "'%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -95,49 +95,49 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:79
+#: src/applications/bootstrap_http/http.c:81
 #: src/applications/testbed/testbed.c:1080
 #, fuzzy, c-format
 msgid "Invalid URL '%s' (must begin with '%s')\n"
 msgstr "Na:"
 
-#: src/applications/bootstrap_http/http.c:107
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
 msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:118
+#: 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:131
+#: src/applications/bootstrap_http/http.c:133
 #, 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:153
-#: src/applications/bootstrap_http/http.c:179
+#: 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:215
+#: 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:250
+#: 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:326
+#: 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:350
+#: src/applications/bootstrap_http/http.c:354
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "#KB Yimuwe ku"
@@ -196,9 +196,10 @@
 #: src/applications/template/gnunet-template.c:87
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:542
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/server/gnunet-peer-info.c:107 src/server/gnunet-transport-check.c:512
-#: src/server/gnunet-update.c:129 src/server/startup.c:512
+#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:117
+#: src/conf/gnunet-setup.c:255 src/server/gnunet-peer-info.c:107
+#: src/server/gnunet-transport-check.c:512 src/server/gnunet-update.c:129
+#: src/server/startup.c:516
 #, fuzzy, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
@@ -531,7 +532,7 @@
 #: src/applications/dht/tools/dhttest2.c:127
 #: src/applications/gap/gaptest.c:317
 #: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:200
+#: src/applications/tbench/tbenchtest.c:199
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr ""
@@ -544,33 +545,43 @@
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:556
+#: src/applications/fragmentation/fragmentation.c:549
 #, fuzzy
 msgid "# messages defragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:550
 #, fuzzy
 msgid "# messages fragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:551
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:561
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:889
+#: src/applications/fs/ecrs/download.c:121
+#, fuzzy, c-format
+msgid "Could not unlink temporary file '%s': %s\n"
+msgstr "OYA Kwandika Kuri IDOSIYE"
+
+#: src/applications/fs/ecrs/download.c:249
+#, fuzzy, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "'%s'%sByanze"
+
+#: src/applications/fs/ecrs/download.c:893
 #, fuzzy
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:1054
+#: src/applications/fs/ecrs/download.c:1062
 #, fuzzy, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr "Kuri OYA Bihari ku i urusobe"
@@ -616,47 +627,52 @@
 msgid "Format of file '%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/search.c:158
+#: src/applications/fs/ecrs/search.c:160
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:210
+#: src/applications/fs/ecrs/search.c:216
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:182
+#: src/applications/fs/ecrs/upload.c:175
 #, fuzzy, c-format
+msgid "'%s' is not a file.\n"
+msgstr "'%s'ni OYA a Ibisanzwe IDOSIYE"
+
+#: src/applications/fs/ecrs/upload.c:192
+#, fuzzy, c-format
 msgid "Cannot hash '%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:210
 #, fuzzy, c-format
 msgid "Initialization for indexing file '%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
 #, c-format
 msgid ""
 "Indexing file '%s' failed. Check file permissions and consult your GNUnet "
 "server's logs.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:289
+#: src/applications/fs/ecrs/upload.c:301
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:239
+#: src/applications/fs/fsui/download.c:240
 #, fuzzy
 msgid "Download aborted."
 msgstr "/Byahiswemo"
 
-#: src/applications/fs/fsui/download.c:242
+#: src/applications/fs/fsui/download.c:243
 #, fuzzy
 msgid "ECRS download failed (see logs)."
 msgstr "OYA Gufungura IDOSIYE"
 
-#: src/applications/fs/fsui/downloadtest.c:185
+#: 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
@@ -664,15 +680,15 @@
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:73
+#: src/applications/fs/fsui/file_info.c:76
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:162
+#: src/applications/fs/fsui/fsui.c:168
 msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:597
+#: src/applications/fs/fsui/fsui.c:616
 #, c-format
 msgid "FSUI state file '%s' had syntax error at offset %u.\n"
 msgstr ""
@@ -692,7 +708,7 @@
 "schedule.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:164
+#: src/applications/fs/fsui/search.c:196
 msgid "This search is already pending!\n"
 msgstr ""
 
@@ -701,27 +717,27 @@
 msgid "Unindex failed.\n"
 msgstr "/Idosiye IDOSIYE"
 
-#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:404
+#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:402
 msgid "Upload failed.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:407
 msgid "Cannot upload directory without using recursion.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:961
+#: src/applications/fs/module/fs.c:988
 #, 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:1002
+#: src/applications/fs/module/fs.c:1029
 #, c-format
 msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1039
+#: src/applications/fs/module/fs.c:1066
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -758,7 +774,7 @@
 "Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1904
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
@@ -1228,7 +1244,8 @@
 msgstr "Inkoresha siyo"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:223
-#: src/server/gnunet-peer-info.c:118 src/server/gnunet-transport-check.c:523
+#: src/conf/gnunet-setup.c:184 src/server/gnunet-peer-info.c:118
+#: src/server/gnunet-transport-check.c:523
 #, fuzzy
 msgid "Invalid arguments. Exiting.\n"
 msgstr "ingingo"
@@ -1381,23 +1398,23 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1893
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
-#: src/applications/gap/gap.c:1897
+#: src/applications/gap/gap.c:1910 src/applications/gap/gap.c:1915
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2113
+#: src/applications/gap/gap.c:2152
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2144
+#: src/applications/gap/gap.c:2183
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr ""
@@ -1413,7 +1430,7 @@
 msgstr "Porogaramu in Iboneza"
 
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:976
+#: src/applications/identity/identity.c:1024
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
@@ -1440,19 +1457,19 @@
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:330
+#: src/applications/identity/identity.c:324
 #, 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:363
+#: src/applications/identity/identity.c:357
 #, fuzzy, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr "%s'%s'Oya"
 
-#: src/applications/identity/identity.c:614
-#: src/applications/identity/identity.c:632
+#: src/applications/identity/identity.c:637
+#: src/applications/identity/identity.c:655
 #, fuzzy, c-format
 msgid "Removed file '%s' containing invalid hello data.\n"
 msgstr "IDOSIYE Sibyo Ibyatanzwe"
@@ -1585,112 +1602,113 @@
 msgid "async RPC reply not received.\n"
 msgstr "Subiza OYA BYAKIRIWE"
 
-#: src/applications/session/connect.c:208
+#: src/applications/session/connect.c:209
 #, fuzzy, c-format
 msgid "Session key from peer '%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:245
+#: src/applications/session/connect.c:246
 #, fuzzy
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:518
+#: src/applications/session/connect.c:520
 #, fuzzy, c-format
 msgid "Invalid '%s' message received from peer '%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:526
+#: src/applications/session/connect.c:529
 #, fuzzy, c-format
-msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
+msgid "setkey '%s' from '%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Bivuye Kugenzura..."
 
-#: src/applications/session/connect.c:578
+#: src/applications/session/connect.c:584
 #, fuzzy
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:725
+#: src/applications/session/connect.c:739
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:727
+#: src/applications/session/connect.c:741
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:729
+#: src/applications/session/connect.c:743
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:745
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:159
-#: src/applications/sqstore_mysql/mysql.c:348
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:835
-#: src/applications/sqstore_mysql/mysql.c:914
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
+#: src/applications/sqstore_mysql/mysql.c:149
+#: src/applications/sqstore_mysql/mysql.c:156
+#: src/applications/sqstore_mysql/mysql.c:362
+#: src/applications/sqstore_mysql/mysql.c:689
+#: src/applications/sqstore_mysql/mysql.c:704
+#: src/applications/sqstore_mysql/mysql.c:713
+#: src/applications/sqstore_mysql/mysql.c:737
+#: src/applications/sqstore_mysql/mysql.c:747
+#: src/applications/sqstore_mysql/mysql.c:796
+#: src/applications/sqstore_mysql/mysql.c:875
+#: src/applications/sqstore_mysql/mysql.c:885
+#: src/applications/sqstore_mysql/mysql.c:955
+#: src/applications/sqstore_mysql/mysql.c:964
+#: src/applications/sqstore_sqlite/sqlite.c:43
+#: src/applications/sqstore_sqlite/sqlite.c:50 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
-#: src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1025 src/include/gnunet_util.h:1032
+#: src/include/gnunet_util.h:1034
 #, fuzzy, c-format
 msgid "'%s' failed at %s:%d with error: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_mysql/mysql.c:462
-#: src/applications/sqstore_mysql/mysql.c:547
-#: src/applications/sqstore_mysql/mysql.c:647
-#: src/applications/sqstore_mysql/mysql.c:802
-#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:505
+#: src/applications/sqstore_mysql/mysql.c:602
+#: src/applications/sqstore_mysql/mysql.c:763
+#: src/applications/sqstore_mysql/mysql.c:777
 msgid "Invalid data in MySQL database.  Please verify integrity!\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1108
+#: src/applications/sqstore_mysql/mysql.c:1065
 #, fuzzy, c-format
 msgid "Query '%s' had no results.\n"
 msgstr "Oya Ibisubizo ku"
 
-#: src/applications/sqstore_mysql/mysql.c:1199
+#: src/applications/sqstore_mysql/mysql.c:1156
 #, fuzzy, c-format
 msgid "Trying to use file '%s' for MySQL configuration.\n"
 msgstr "Kuri Gukoresha IDOSIYE kugirango Iboneza"
 
-#: src/applications/sqstore_mysql/mysqltest.c:257
-#: src/applications/sqstore_sqlite/sqlitetest.c:259
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/sqstore_sqlite/sqlitetest.c:258
 #, fuzzy
 msgid "Could not initialize libgnunetutil!\n"
 msgstr "OYA gutangiza Modire"
 
-#: src/applications/sqstore_sqlite/sqlite.c:181
-#: src/applications/sqstore_sqlite/sqlite.c:201
+#: src/applications/sqstore_sqlite/sqlite.c:197
+#: src/applications/sqstore_sqlite/sqlite.c:217
 #, fuzzy
 msgid "SQL Database corrupt, ignoring result.\n"
 msgstr "Ububikoshingiro Kuri"
 
-#: src/applications/sqstore_sqlite/sqlite.c:406
-#: src/applications/sqstore_sqlite/sqlite.c:601
+#: src/applications/sqstore_sqlite/sqlite.c:428
+#: src/applications/sqstore_sqlite/sqlite.c:621
 msgid "Invalid data in database.  Please verify integrity!\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:915
+#: src/applications/sqstore_sqlite/sqlite.c:979
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storing FS data in section '%"
 "s' under '%s'.\n"
 msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
 
-#: src/applications/sqstore_sqlite/sqlite.c:929
+#: src/applications/sqstore_sqlite/sqlite.c:993
 #, fuzzy
 msgid "Unable to initialize SQLite.\n"
 msgstr "Kuri gutangiza"
@@ -1888,7 +1906,7 @@
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr "OYA Akira i Ubutumwa Bivuye"
 
-#: src/applications/tbench/tbench.c:447
+#: src/applications/tbench/tbench.c:448
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1914,7 +1932,7 @@
 "Failed to receive reply from gnunetd.\n"
 msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
 
-#: src/applications/tbench/tbenchtest.c:212
+#: src/applications/tbench/tbenchtest.c:211
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -2159,7 +2177,7 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:388
+#: src/applications/topology_default/topology.c:400
 #, c-format
 msgid "Version mismatch ('%s' vs. '%*.s'), run gnunet-update!\n"
 msgstr ""
@@ -2288,41 +2306,47 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/transport/transport.c:469
-#: src/applications/transport/transport.c:477
+#: src/applications/transport/transport.c:471
+#: src/applications/transport/transport.c:479
 #, fuzzy, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:635
+#: src/applications/transport/transport.c:639
 #, 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:650
+#: src/applications/transport/transport.c:654
 #, 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:676
+#: src/applications/transport/transport.c:680
 #, 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:697
+#: src/applications/transport/transport.c:701
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr ""
 
-#: src/conf/recreate.c:71
+#: src/conf/conf.c:522 src/conf/recreate.c:100
 #, fuzzy, c-format
-msgid "Unable to save configuration files: %s.\n"
+msgid "Unable to save configuration file '%s': %s.\n"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/conf/recreate.c:75
-msgid "Configuration files (re)created.\n"
+#: src/conf/conf.c:529
+#, fuzzy, c-format
+msgid "Configuration file '%s' created.\n"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/conf/confdata.c:93
+#, c-format
+msgid "%s: symbol value '%s' invalid for %s\n"
 msgstr ""
 
 #: src/conf/gconf_interface.c:135
@@ -2493,96 +2517,160 @@
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:33
+#: src/conf/gnunet-setup.c:93
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:101
+msgid "Tool to setup GNUnet."
+msgstr ""
+
+#: src/conf/gnunet-setup.c:102
+#, c-format
+msgid "Available MODEs:\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:103
+#, fuzzy, c-format
+msgid " config\t\ttext-based configuration\n"
+msgstr "A bushyinguro"
+
+#: src/conf/gnunet-setup.c:105
+#, c-format
+msgid " menuconfig\ttext-based menu\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:107
+#, c-format
+msgid " wizard-curses\tBasic text-based graphical configuration\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:110
+#, fuzzy, c-format
+msgid " gconfig\tGTK configuration\n"
+msgstr "A bushyinguro"
+
+#: src/conf/gnunet-setup.c:111
+#, c-format
 msgid ""
-"USAGE: gnunet-setup MODULE\n"
-"\n"
-"MODULE\n"
-" recreate\trecreate configuration files\n"
-" config\t\ttext-based configuration\n"
-" menuconfig\ttext-based menu\n"
-" gconfig\tGTK configuration\n"
-" wizard-curses\tBasic text-based graphical configuration\n"
 " wizard-gtk\tBasic GTK configuration\n"
 "\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:97
-#, fuzzy
-msgid "Please specify a path where the configuration files will be stored."
-msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
+#: src/conf/gnunet-setup.c:172
+#, fuzzy, c-format
+msgid "gnunet-setup must have write-access to the configuration file '%s'\n"
+msgstr "OYA Iboneza IDOSIYE"
 
-#: src/conf/gnunet-win-tool.c:108
+#: src/conf/gnunet-setup.c:181 src/server/gnunet-peer-info.c:113
+#: src/server/gnunet-transport-check.c:518 src/server/gnunet-update.c:139
+#, fuzzy, c-format
+msgid "Invalid arguments: "
+msgstr "ingingo"
+
+#: src/conf/gnunet-setup.c:223
 #, c-format
+msgid "menuconfig is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:228 src/conf/gnunet-setup.c:238
+#, c-format
+msgid ""
+"Can only run wizard to configure gnunetd.\n"
+"Did you forget the '%s' option?\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:233
+#, c-format
+msgid "wizard-curses is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:243
+#, c-format
+msgid "wizard-gtk is not available\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:250
+#, fuzzy, c-format
+msgid "gconfig is not available\n"
+msgstr "Bihari"
+
+#: src/conf/gnunet-setup.c:254
+#, fuzzy, c-format
+msgid "Unknown operation '%s'\n"
+msgstr "Imiterere Verisiyo"
+
+#: src/conf/gnunet-win-tool.c:109
+#, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:111 src/conf/gnunet-win-tool.c:138
+#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:115 src/conf/gnunet-win-tool.c:142
+#: 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"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:120
+#: src/conf/gnunet-win-tool.c:121
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:123 src/conf/gnunet-win-tool.c:154
+#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
 #, fuzzy, c-format
 msgid "Unknown error.\n"
 msgstr "Verisiyo"
 
-#: src/conf/gnunet-win-tool.c:135
+#: src/conf/gnunet-win-tool.c:136
 #, fuzzy, c-format
 msgid "Service deleted.\n"
 msgstr "/Byahiswemo"
 
-#: src/conf/gnunet-win-tool.c:147
+#: src/conf/gnunet-win-tool.c:148
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:151
+#: src/conf/gnunet-win-tool.c:152
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/conf/wizard_callbacks.c:213
+#: src/conf/wizard_callbacks.c:169
 #, fuzzy, c-format
-msgid "Unable to save configuration file %s:"
+msgid "Unable to save configuration file '%s':"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
+#: src/conf/wizard_callbacks.c:189 src/conf/wizard_curs.c:613
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
+#: src/conf/wizard_callbacks.c:196 src/conf/wizard_curs.c:616
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
+#: src/conf/wizard_curs.c:57 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:120 src/conf/wizard_util.c:162
 msgid "Error"
 msgstr ""
 
-#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
-#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
-#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
-#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
-#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
-#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
-#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
+#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:128
+#: src/conf/wizard_curs.c:181 src/conf/wizard_curs.c:218
+#: src/conf/wizard_curs.c:248 src/conf/wizard_curs.c:274
+#: src/conf/wizard_curs.c:307 src/conf/wizard_curs.c:334
+#: src/conf/wizard_curs.c:366 src/conf/wizard_curs.c:391
+#: src/conf/wizard_curs.c:420 src/conf/wizard_curs.c:443
+#: src/conf/wizard_curs.c:498 src/conf/wizard_curs.c:560
+#: src/conf/wizard_curs.c:591 src/conf/wizard_curs.c:635
 #, fuzzy
 msgid "GNUnet configuration"
 msgstr "A bushyinguro"
 
-#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:114
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -2590,50 +2678,50 @@
 "GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
-"\thttp://www.gnunet.org\n";
+"\thttp://gnunet.org/\n";
 "and join our community at\n"
-"\thttp://www.gnunet.org/drupal/\n";
+"\thttp://gnunet.org/drupal/\n";
 "\n"
 "Have a lot of fun,\n"
 "\n"
 "the GNUnet team"
 msgstr ""
 
-#: src/conf/wizard_curs.c:115
+#: src/conf/wizard_curs.c:129
 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/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
-#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:188
+#: src/conf/wizard_curs.c:225 src/conf/wizard_curs.c:280
+#: src/conf/wizard_curs.c:312 src/conf/wizard_curs.c:372
 #, fuzzy
 msgid "Help"
 msgstr "/Kugoboka"
 
-#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:189
 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:167
+#: src/conf/wizard_curs.c:182
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:202
+#: src/conf/wizard_curs.c:219
 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:208
+#: src/conf/wizard_curs.c:226
 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 "
@@ -2644,7 +2732,7 @@
 "IP-Address."
 msgstr ""
 
-#: src/conf/wizard_curs.c:230
+#: src/conf/wizard_curs.c:249
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -2655,11 +2743,11 @@
 "forwarding\")."
 msgstr ""
 
-#: src/conf/wizard_curs.c:255
+#: src/conf/wizard_curs.c:275
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:260
+#: src/conf/wizard_curs.c:280
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2670,11 +2758,11 @@
 "connection."
 msgstr ""
 
-#: src/conf/wizard_curs.c:287
+#: src/conf/wizard_curs.c:307
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:292
+#: src/conf/wizard_curs.c:313
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2685,7 +2773,7 @@
 "connection."
 msgstr ""
 
-#: src/conf/wizard_curs.c:313
+#: src/conf/wizard_curs.c:335
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -2698,18 +2786,18 @@
 "connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/conf/wizard_curs.c:344
+#: src/conf/wizard_curs.c:367
 msgid "How much CPU (in %) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:373
 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/conf/wizard_curs.c:367
+#: src/conf/wizard_curs.c:392
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -2722,7 +2810,7 @@
 "availability."
 msgstr ""
 
-#: src/conf/wizard_curs.c:395
+#: src/conf/wizard_curs.c:421
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -2730,7 +2818,7 @@
 "inserted and migrated content)."
 msgstr ""
 
-#: src/conf/wizard_curs.c:417
+#: src/conf/wizard_curs.c:444
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -2739,7 +2827,7 @@
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/conf/wizard_curs.c:440
+#: src/conf/wizard_curs.c:499
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -2755,7 +2843,7 @@
 "GNUnet user:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:468
+#: src/conf/wizard_curs.c:561
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -2770,7 +2858,7 @@
 "GNUnet group:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:497
+#: src/conf/wizard_curs.c:592
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -2778,7 +2866,7 @@
 "Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:576
+#: src/conf/wizard_curs.c:629
 #, fuzzy, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -2793,6 +2881,23 @@
 msgid "GNUnet configuration assistant"
 msgstr "A bushyinguro"
 
+#: src/conf/wizard_interface.c:77
+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://www.gnunet.org\n";
+"and join our community at\n"
+"\thttp://www.gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
+msgstr ""
+
 #: src/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
 #: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
 msgid "Next"
@@ -3009,33 +3114,33 @@
 msgid "Can't access the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:111
+#: src/conf/wizard_util.c:112
 msgid "Can't delete the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:114
+#: src/conf/wizard_util.c:116
 #, fuzzy
 msgid "Unknown error"
 msgstr "Verisiyo"
 
-#: src/conf/wizard_util.c:143
+#: src/conf/wizard_util.c:145
 msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/conf/wizard_util.c:147
+#: src/conf/wizard_util.c:149
 #, fuzzy
 msgid "Error creating user"
 msgstr "Ivugurura Verisiyo"
 
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:152
 msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/conf/wizard_util.c:153
+#: src/conf/wizard_util.c:155
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/conf/wizard_util.c:156
+#: src/conf/wizard_util.c:158
 msgid "Unknown error while creating a new user"
 msgstr ""
 
@@ -3049,46 +3154,46 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2155
+#: src/server/connection.c:2192
 #, fuzzy, c-format
 msgid "Message from '%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2232
+#: src/server/connection.c:2269
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2248
+#: src/server/connection.c:2285
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2641
+#: src/server/connection.c:2679
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2643
+#: src/server/connection.c:2681
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2645
+#: src/server/connection.c:2683
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2647
+#: src/server/connection.c:2685
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2649
+#: src/server/connection.c:2687
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2651
+#: src/server/connection.c:2689
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"
@@ -3152,12 +3257,6 @@
 msgid "Print information about GNUnet peers."
 msgstr "Ibisobanuro Ibyerekeye"
 
-#: src/server/gnunet-peer-info.c:113 src/server/gnunet-transport-check.c:518
-#: src/server/gnunet-update.c:139
-#, fuzzy, c-format
-msgid "Invalid arguments: "
-msgstr "ingingo"
-
 #: 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"
@@ -3323,27 +3422,27 @@
 msgid "Updated data for %d applications.\n"
 msgstr "Ibyatanzwe kugirango Porogaramu"
 
-#: src/server/gnunetd.c:108
+#: src/server/gnunetd.c:115
 #, 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:116
+#: src/server/gnunetd.c:123
 #, c-format
 msgid "'%s' starting\n"
 msgstr ""
 
-#: src/server/gnunetd.c:138
+#: src/server/gnunetd.c:145
 #, fuzzy, c-format
 msgid "'%s' startup complete.\n"
 msgstr "'%s'Byuzuye"
 
-#: src/server/gnunetd.c:143
+#: src/server/gnunetd.c:150
 #, fuzzy, c-format
 msgid "'%s' is shutting down.\n"
 msgstr "'%s'ni Hasi"
 
-#: src/server/handler.c:366
+#: src/server/handler.c:367
 #, fuzzy, c-format
 msgid "Received corrupt message from peer '%s'in %s:%d.\n"
 msgstr "Ubutumwa Bivuye in"
@@ -3380,27 +3479,27 @@
 msgid "Starts the gnunetd daemon."
 msgstr "i"
 
-#: src/server/startup.c:488
+#: src/server/startup.c:412
 #, fuzzy, c-format
-msgid "User '%s' not known, cannot change UID to it."
+msgid "User '%s' not known, cannot change UID to it.\n"
 msgstr "OYA Guhindura>> Kuri"
 
-#: src/server/startup.c:499
+#: src/server/startup.c:421
 #, fuzzy, c-format
-msgid "Cannot change user/group to '%s': %s"
+msgid "Cannot change user/group to '%s': %s\n"
 msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
 
-#: src/server/startup.c:518
+#: src/server/startup.c:522
 #, fuzzy
 msgid "Invalid command-line arguments:\n"
 msgstr "Komandi: Umurongo ingingo"
 
-#: src/server/startup.c:521
+#: src/server/startup.c:525
 #, c-format
 msgid "Argument %d: '%s'\n"
 msgstr ""
 
-#: src/server/startup.c:527
+#: src/server/startup.c:531
 #, fuzzy
 msgid "Invalid command-line arguments.\n"
 msgstr "Komandi: Umurongo ingingo"
@@ -3417,7 +3516,7 @@
 "entry '%s': %s\n"
 msgstr "urusobe in i Iboneza in Icyiciro kugirango Icyinjijwe"
 
-#: src/server/tcpserver.c:802
+#: src/server/tcpserver.c:806
 #, fuzzy, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
@@ -3442,7 +3541,7 @@
 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:689 src/transports/udp.c:286
+#: src/transports/http.c:817 src/transports/tcp.c:692 src/transports/udp.c:286
 #, fuzzy, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
@@ -3474,7 +3573,7 @@
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1132 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, fuzzy, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -3583,27 +3682,27 @@
 "Received malformed message (size %u) from tcp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/tcp.c:1057
+#: src/transports/tcp.c:1064
 #, fuzzy
 msgid "Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:1314 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:1424
+#: src/transports/tcp.c:1431
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:1426
+#: src/transports/tcp.c:1433
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:1428
+#: src/transports/tcp.c:1435
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
@@ -3818,17 +3917,14 @@
 msgid "Syntax error in configuration file '%s' at line %d.\n"
 msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/util/configuration.c:471
-#, fuzzy, c-format
-msgid ""
-"Configuration file '%s' not found. I will try to create the default "
-"configuration file at that location.\n"
+#: src/util/configuration.c:509 src/util/configuration.c:511
+#, c-format
+msgid "Configuration file '%s' not found.  Run gnunet-setup!\n"
 msgstr ""
-"IDOSIYE OYA Byabonetse Kuri Kurema i Mburabuzi Iboneza IDOSIYE ku Ahantu"
 
-#: src/util/configuration.c:488
+#: src/util/configuration.c:515
 #, fuzzy, c-format
-msgid "Cannot open configuration file '%s'\n"
+msgid "Cannot open configuration file '%s'.\n"
 msgstr "Gufungura Iboneza IDOSIYE"
 
 #: src/util/cron.c:229
@@ -3917,7 +4013,7 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Isinya Byanze ku"
 
-#: src/util/initialize.c:151
+#: src/util/initialize.c:228
 #, fuzzy
 msgid "Shutdown complete.\n"
 msgstr "Byuzuye"
@@ -4171,13 +4267,24 @@
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util.h:1027 src/include/gnunet_util.h:1029
-#: src/include/gnunet_util.h:1036
+#: src/include/gnunet_util.h:1041 src/include/gnunet_util.h:1043
+#: src/include/gnunet_util.h:1050
 #, 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 "Please specify a path where the configuration files will be stored."
+#~ msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file '%s' not found. I will try to create the default "
+#~ "configuration file at that location.\n"
+#~ msgstr ""
+#~ "IDOSIYE OYA Byabonetse Kuri Kurema i Mburabuzi Iboneza IDOSIYE ku Ahantu"
+
+#, fuzzy
 #~ msgid "# client trace requests received"
 #~ msgstr "#Umukiriya BYAKIRIWE"
 
@@ -4565,10 +4672,6 @@
 #~ msgstr "S"
 
 #, fuzzy
-#~ msgid "Files available"
-#~ msgstr "Bihari"
-
-#, fuzzy
 #~ msgid "Files selected"
 #~ msgstr "Byahiswemo"
 
@@ -5175,10 +5278,6 @@
 #~ msgstr "Kuri Gusiba"
 
 #, fuzzy
-#~ msgid "Unknown format version: %d.\n"
-#~ msgstr "Imiterere Verisiyo"
-
-#, fuzzy
 #~ msgid "/Select by filename"
 #~ msgstr "/ku Izina ry'idosiye:"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2005-08-18 03:56:29 UTC (rev 1728)
+++ GNUnet/po/vi.po     2005-08-18 03:59:07 UTC (rev 1729)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-18 01:09+0200\n"
+"POT-Creation-Date: 2005-08-17 21:04-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"
@@ -71,7 +71,7 @@
 msgstr "# Đã chuyển tiếp quàng cáo ngoài"
 
 #: src/applications/advertising/advertising.c:726
-#: src/applications/session/connect.c:735
+#: src/applications/session/connect.c:749
 #, c-format
 msgid "'%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -86,50 +86,50 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:79
+#: src/applications/bootstrap_http/http.c:81
 #: src/applications/testbed/testbed.c:1080
 #, c-format
 msgid "Invalid URL '%s' (must begin with '%s')\n"
 msgstr "URL sai '%s' (phải bắt đầu với '%s')\n"
 
-#: src/applications/bootstrap_http/http.c:107
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
 msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
 
-#: src/applications/bootstrap_http/http.c:118
+#: src/applications/bootstrap_http/http.c:120
 #, 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/bootstrap_http/http.c:131
+#: src/applications/bootstrap_http/http.c:133
 #, c-format
 msgid "Could not download list of peer contacts, host '%s' unknown.\n"
 msgstr ""
 "Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không rõ.\n"
 
-#: src/applications/bootstrap_http/http.c:153
-#: src/applications/bootstrap_http/http.c:179
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
 #, c-format
 msgid "'%s' to '%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' tới '%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/bootstrap_http/http.c:215
+#: src/applications/bootstrap_http/http.c:217
 #, c-format
 msgid "Parsing HTTP response for URL '%s' failed.\n"
 msgstr "Phân tích câu trả lời HTTP cho URL '%s' không thành công.\n"
 
-#: src/applications/bootstrap_http/http.c:250
+#: src/applications/bootstrap_http/http.c:252
 #, fuzzy, c-format
 msgid "Parsing hello from '%s' failed.\n"
 msgstr "Phân tích HELO từ '%s' không thành công.\n"
 
-#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:330
 #, c-format
 msgid "Could not resolve name of HTTP proxy '%s'. Trying without a proxy.\n"
 msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
 
-#: src/applications/bootstrap_http/http.c:350
+#: src/applications/bootstrap_http/http.c:354
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
@@ -183,9 +183,10 @@
 #: src/applications/template/gnunet-template.c:87
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:542
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/server/gnunet-peer-info.c:107 src/server/gnunet-transport-check.c:512
-#: src/server/gnunet-update.c:129 src/server/startup.c:512
+#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:117
+#: src/conf/gnunet-setup.c:255 src/server/gnunet-peer-info.c:107
+#: src/server/gnunet-transport-check.c:512 src/server/gnunet-update.c:129
+#: src/server/startup.c:516
 #, 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"
@@ -504,7 +505,7 @@
 #: src/applications/dht/tools/dhttest2.c:127
 #: src/applications/gap/gaptest.c:317
 #: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:200
+#: 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"
@@ -517,24 +518,34 @@
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
 
-#: src/applications/fragmentation/fragmentation.c:556
+#: src/applications/fragmentation/fragmentation.c:549
 msgid "# messages defragmented"
 msgstr "# thông báo đã gom lại"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:550
 msgid "# messages fragmented"
 msgstr "# thông báo đã phân mảnh"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:551
 msgid "# fragments discarded"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:561
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d\n"
 
-#: src/applications/fs/ecrs/download.c:889
+#: src/applications/fs/ecrs/download.c:121
+#, fuzzy, c-format
+msgid "Could not unlink temporary file '%s': %s\n"
+msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
+
+#: src/applications/fs/ecrs/download.c:249
+#, fuzzy, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "'%s' %s không thành công: %s\n"
+
+#: src/applications/fs/ecrs/download.c:893
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -542,7 +553,7 @@
 "Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc một "
 "tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
 
-#: src/applications/fs/ecrs/download.c:1054
+#: src/applications/fs/ecrs/download.c:1062
 #, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
@@ -590,25 +601,30 @@
 msgid "Format of file '%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
 
-#: src/applications/fs/ecrs/search.c:158
+#: 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/fs/ecrs/search.c:210
+#: 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/fs/ecrs/upload.c:182
+#: src/applications/fs/ecrs/upload.c:175
+#, fuzzy, c-format
+msgid "'%s' is not a file.\n"
+msgstr "'%s' không phải là một tập tin thông thường.\n"
+
+#: src/applications/fs/ecrs/upload.c:192
 #, c-format
 msgid "Cannot hash '%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file '%s' failed.\n"
 msgstr "Nạp để đánh chỉ mục tập tin '%s' thất bại.\n"
 
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
 #, c-format
 msgid ""
 "Indexing file '%s' failed. Check file permissions and consult your GNUnet "
@@ -617,20 +633,20 @@
 "Đánh chỉ mục tập tin '%s' thất bại. Hãy kiểm tra quyền hạn và xem các bản "
 "ghi log của máy chủ GNUnet.\n"
 
-#: src/applications/fs/ecrs/upload.c:289
+#: src/applications/fs/ecrs/upload.c:301
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
 
-#: src/applications/fs/fsui/download.c:239
+#: src/applications/fs/fsui/download.c:240
 msgid "Download aborted."
 msgstr "Dừng tải xuống."
 
-#: src/applications/fs/fsui/download.c:242
+#: src/applications/fs/fsui/download.c:243
 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/downloadtest.c:185
+#: 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
@@ -638,15 +654,15 @@
 msgid "AND"
 msgstr "VÀ"
 
-#: src/applications/fs/fsui/file_info.c:73
+#: src/applications/fs/fsui/file_info.c:76
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Tắt bỏ thu thập tên tập tin.\n"
 
-#: src/applications/fs/fsui/fsui.c:162
+#: src/applications/fs/fsui/fsui.c:168
 msgid "FSUI persistence: error restoring download\n"
 msgstr "FSUI: lỗi phục hồi tải xuống\n"
 
-#: src/applications/fs/fsui/fsui.c:597
+#: src/applications/fs/fsui/fsui.c:616
 #, 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"
@@ -668,7 +684,7 @@
 "Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một tuần "
 "so với lịch.\n"
 
-#: src/applications/fs/fsui/search.c:164
+#: src/applications/fs/fsui/search.c:196
 msgid "This search is already pending!\n"
 msgstr "Tìm kiếm này đang chờ đợi!\n"
 
@@ -676,15 +692,15 @@
 msgid "Unindex failed.\n"
 msgstr "Bỏ đánh chỉ mục thất bại.\n"
 
-#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:404
+#: src/applications/fs/fsui/upload.c:365 src/applications/fs/fsui/upload.c:402
 msgid "Upload failed.\n"
 msgstr "Tải lên thất bại.\n"
 
-#: src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:407
 msgid "Cannot upload directory without using recursion.\n"
 msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
 
-#: src/applications/fs/module/fs.c:961
+#: src/applications/fs/module/fs.c:988
 #, c-format
 msgid ""
 "You must specify a postive number for '%s' in the configuration in section '%"
@@ -692,12 +708,12 @@
 msgstr ""
 "Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
 
-#: src/applications/fs/module/fs.c:1002
+#: src/applications/fs/module/fs.c:1029
 #, c-format
 msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1039
+#: src/applications/fs/module/fs.c:1066
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -741,7 +757,7 @@
 "Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
 msgstr "Khối ODB đã bỏ chỉ mục '%s' từ %llu không có trong kho dữ liệu.\n"
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1904
 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"
 
@@ -1159,7 +1175,8 @@
 msgstr "Tham số sai: '%s'\n"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:223
-#: src/server/gnunet-peer-info.c:118 src/server/gnunet-transport-check.c:523
+#: src/conf/gnunet-setup.c:184 src/server/gnunet-peer-info.c:118
+#: src/server/gnunet-transport-check.c:523
 msgid "Invalid arguments. Exiting.\n"
 msgstr "Tham số sai. Đang thoát.\n"
 
@@ -1294,19 +1311,19 @@
 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:1869
+#: src/applications/gap/gap.c:1893
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
 "yêu cầu.\n"
 
-#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
-#: src/applications/gap/gap.c:1897
+#: src/applications/gap/gap.c:1910 src/applications/gap/gap.c:1915
+#: src/applications/gap/gap.c:1921
 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:2113
+#: src/applications/gap/gap.c:2152
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1314,7 +1331,7 @@
 "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:2144
+#: src/applications/gap/gap.c:2183
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
@@ -1330,7 +1347,7 @@
 msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
 
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:976
+#: src/applications/identity/identity.c:1024
 #, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
@@ -1359,20 +1376,20 @@
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
-#: src/applications/identity/identity.c:330
+#: src/applications/identity/identity.c:324
 #, c-format
 msgid ""
 "File '%s' in directory '%s' does not match naming convention. Removed.\n"
 msgstr ""
 "Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:363
+#: src/applications/identity/identity.c:357
 #, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr "%s '%s' không trả lại máy biết đến!\n"
 
-#: src/applications/identity/identity.c:614
-#: src/applications/identity/identity.c:632
+#: src/applications/identity/identity.c:637
+#: src/applications/identity/identity.c:655
 #, 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"
@@ -1503,105 +1520,106 @@
 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:208
+#: src/applications/session/connect.c:209
 #, c-format
 msgid "Session key from peer '%s' could not be verified.\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:245
+#: 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:518
+#: src/applications/session/connect.c:520
 #, c-format
 msgid "Invalid '%s' message received from peer '%s'.\n"
 msgstr "Nhận được thông báo '%s' sai từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:526
-#, c-format
-msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
+#: src/applications/session/connect.c:529
+#, fuzzy, c-format
+msgid "setkey '%s' from '%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Kiểm tra CRC của SKEY từ '%s' không thành công (có: %u, muốn %u).\n"
 
-#: src/applications/session/connect.c:578
+#: src/applications/session/connect.c:584
 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:725
+#: src/applications/session/connect.c:739
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:727
+#: src/applications/session/connect.c:741
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:729
+#: src/applications/session/connect.c:743
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:731
+#: src/applications/session/connect.c:745
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
-#: src/applications/sqstore_mysql/mysql.c:152
-#: src/applications/sqstore_mysql/mysql.c:159
-#: src/applications/sqstore_mysql/mysql.c:348
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:835
-#: src/applications/sqstore_mysql/mysql.c:914
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
+#: src/applications/sqstore_mysql/mysql.c:149
+#: src/applications/sqstore_mysql/mysql.c:156
+#: src/applications/sqstore_mysql/mysql.c:362
+#: src/applications/sqstore_mysql/mysql.c:689
+#: src/applications/sqstore_mysql/mysql.c:704
+#: src/applications/sqstore_mysql/mysql.c:713
+#: src/applications/sqstore_mysql/mysql.c:737
+#: src/applications/sqstore_mysql/mysql.c:747
+#: src/applications/sqstore_mysql/mysql.c:796
+#: src/applications/sqstore_mysql/mysql.c:875
+#: src/applications/sqstore_mysql/mysql.c:885
+#: src/applications/sqstore_mysql/mysql.c:955
+#: src/applications/sqstore_mysql/mysql.c:964
+#: src/applications/sqstore_sqlite/sqlite.c:43
+#: src/applications/sqstore_sqlite/sqlite.c:50 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1011 src/include/gnunet_util.h:1018
-#: src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1025 src/include/gnunet_util.h:1032
+#: src/include/gnunet_util.h:1034
 #, 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:462
-#: src/applications/sqstore_mysql/mysql.c:547
-#: src/applications/sqstore_mysql/mysql.c:647
-#: src/applications/sqstore_mysql/mysql.c:802
-#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:505
+#: src/applications/sqstore_mysql/mysql.c:602
+#: src/applications/sqstore_mysql/mysql.c:763
+#: src/applications/sqstore_mysql/mysql.c:777
 msgid "Invalid data in MySQL database.  Please verify integrity!\n"
 msgstr ""
 "Dữ liệu sai trong cơ sở dữ liệu MySQL.  Xin hãy kiểm tra tính trọn vẹn!\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1108
+#: src/applications/sqstore_mysql/mysql.c:1065
 #, 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:1199
+#: src/applications/sqstore_mysql/mysql.c:1156
 #, 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/mysqltest.c:257
-#: src/applications/sqstore_sqlite/sqlitetest.c:259
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/sqstore_sqlite/sqlitetest.c:258
 msgid "Could not initialize libgnunetutil!\n"
 msgstr "Không chạy được libgnunetutil!\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:181
-#: src/applications/sqstore_sqlite/sqlite.c:201
+#: src/applications/sqstore_sqlite/sqlite.c:197
+#: src/applications/sqstore_sqlite/sqlite.c:217
 msgid "SQL Database corrupt, ignoring result.\n"
 msgstr "Cơ sở dữ liệu SQL bị hỏng, đang lờ đi kết quả.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:406
-#: src/applications/sqstore_sqlite/sqlite.c:601
+#: src/applications/sqstore_sqlite/sqlite.c:428
+#: src/applications/sqstore_sqlite/sqlite.c:621
 msgid "Invalid data in database.  Please verify integrity!\n"
 msgstr "Dữ liệu sai trong cơ sở dữ liệu.  Xin hãy kiểm tra tính trọn vẹn!\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:915
+#: src/applications/sqstore_sqlite/sqlite.c:979
 #, c-format
 msgid ""
 "Configuration file must specify directory for storing FS data in section '%"
@@ -1610,7 +1628,7 @@
 "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' dưới "
 "'%s'.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:929
+#: src/applications/sqstore_sqlite/sqlite.c:993
 msgid "Unable to initialize SQLite.\n"
 msgstr "Không chạy được SQLite.\n"
 
@@ -1781,7 +1799,7 @@
 "\n"
 "Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/tbench/tbench.c:447
+#: src/applications/tbench/tbench.c:448
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1809,7 +1827,7 @@
 "\n"
 "Không nhận thành công câu trả lời từ gnunetd.\n"
 
-#: src/applications/tbench/tbenchtest.c:212
+#: src/applications/tbench/tbenchtest.c:211
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Đang chạy thử mức độ (benchmark)...\n"
@@ -2011,7 +2029,7 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:388
+#: src/applications/topology_default/topology.c:400
 #, 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"
@@ -2132,19 +2150,19 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/transport/transport.c:469
-#: src/applications/transport/transport.c:477
+#: src/applications/transport/transport.c:471
+#: src/applications/transport/transport.c:479
 #, 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:635
+#: src/applications/transport/transport.c:639
 #, 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/transport/transport.c:650
+#: src/applications/transport/transport.c:654
 #, c-format
 msgid ""
 "You should specify at least one transport service under option '%s' in "
@@ -2153,25 +2171,31 @@
 "Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn '%s' "
 "trong phần '%s'.\n"
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:680
 #, c-format
 msgid "Transport library '%s' did not provide required function '%s%s'.\n"
 msgstr "Thư viện giao thông '%s' không cung cấp chức năng yêu cầu '%s%s'.\n"
 
-#: src/applications/transport/transport.c:697
+#: src/applications/transport/transport.c:701
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
 
-#: src/conf/recreate.c:71
-#, c-format
-msgid "Unable to save configuration files: %s.\n"
+#: src/conf/conf.c:522 src/conf/recreate.c:100
+#, 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/conf/recreate.c:75
-msgid "Configuration files (re)created.\n"
+#: src/conf/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/confdata.c:93
+#, c-format
+msgid "%s: symbol value '%s' invalid for %s\n"
+msgstr ""
+
 #: src/conf/gconf_interface.c:135
 msgid "Gtk GNUnet Configurator"
 msgstr "Trình cấu hình Gtk của GNUnet"
@@ -2329,105 +2353,160 @@
 msgid "Couldn't find pixmap file: %s"
 msgstr "Không tìm thấy tập tin ảnh pixmap: %s"
 
-#: src/conf/gnunet-setup.c:33
-#, fuzzy
+#: src/conf/gnunet-setup.c:93
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:101
+msgid "Tool to setup GNUnet."
+msgstr ""
+
+#: src/conf/gnunet-setup.c:102
+#, c-format
+msgid "Available MODEs:\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:103
+#, fuzzy, c-format
+msgid " config\t\ttext-based configuration\n"
+msgstr "Cấu hình GNUnet"
+
+#: src/conf/gnunet-setup.c:105
+#, c-format
+msgid " menuconfig\ttext-based menu\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:107
+#, c-format
+msgid " wizard-curses\tBasic text-based graphical configuration\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:110
+#, fuzzy, c-format
+msgid " gconfig\tGTK configuration\n"
+msgstr "Cấu hình GNUnet"
+
+#: src/conf/gnunet-setup.c:111
+#, c-format
 msgid ""
-"USAGE: gnunet-setup MODULE\n"
-"\n"
-"MODULE\n"
-" recreate\trecreate configuration files\n"
-" config\t\ttext-based configuration\n"
-" menuconfig\ttext-based menu\n"
-" gconfig\tGTK configuration\n"
-" wizard-curses\tBasic text-based graphical configuration\n"
 " wizard-gtk\tBasic GTK configuration\n"
 "\n"
 msgstr ""
-"SỬ DỤNG: gnunet-setup MÔ-ĐUN\n"
-"\n"
-"MÔ-ĐUN\n"
-" recreate\ttạo lại các tập tin cấu hình\n"
-" config\t\tcấu hình ở chế độ văn bản\n"
-" menuconfig\tthực đơn ở chế độ văn bản\n"
-" gconfig\tcấu hình GTK\n"
-" wizard-curses\tCấu hình đồ hoạ dạng văn bản cơ bản\n"
-" wizard-gtk\tCấu hình GTK cơ bản\n"
-"\n"
 
-#: src/conf/gnunet-setup.c:97
-msgid "Please specify a path where the configuration files will be stored."
-msgstr "Xin hãy chỉ ra một đường dẫn để chứa các tập tin cấu hình."
+#: src/conf/gnunet-setup.c:172
+#, fuzzy, c-format
+msgid "gnunet-setup must have write-access to the configuration file '%s'\n"
+msgstr "Không phân tích được tập tin cấu hình '%s'.\n"
 
-#: src/conf/gnunet-win-tool.c:108
+#: src/conf/gnunet-setup.c:181 src/server/gnunet-peer-info.c:113
+#: src/server/gnunet-transport-check.c:518 src/server/gnunet-update.c:139
 #, c-format
+msgid "Invalid arguments: "
+msgstr "Tham số sai: "
+
+#: src/conf/gnunet-setup.c:223
+#, fuzzy, c-format
+msgid "menuconfig is not available\n"
+msgstr " Giao thông %d là không thể\n"
+
+#: src/conf/gnunet-setup.c:228 src/conf/gnunet-setup.c:238
+#, c-format
+msgid ""
+"Can only run wizard to configure gnunetd.\n"
+"Did you forget the '%s' option?\n"
+msgstr ""
+
+#: src/conf/gnunet-setup.c:233
+#, fuzzy, c-format
+msgid "wizard-curses is not available\n"
+msgstr " Giao thông %d là không thể\n"
+
+#: src/conf/gnunet-setup.c:243
+#, fuzzy, c-format
+msgid "wizard-gtk is not available\n"
+msgstr " Giao thông %d là không thể\n"
+
+#: src/conf/gnunet-setup.c:250
+#, fuzzy, c-format
+msgid "gconfig is not available\n"
+msgstr " Giao thông %d là không thể\n"
+
+#: src/conf/gnunet-setup.c:254
+#, fuzzy, c-format
+msgid "Unknown operation '%s'\n"
+msgstr "Không mở được tập tin cấu hình '%s'\n"
+
+#: src/conf/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:111 src/conf/gnunet-win-tool.c:138
+#: src/conf/gnunet-win-tool.c:112 src/conf/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:115 src/conf/gnunet-win-tool.c:142
+#: 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"
 msgstr "Lỗi: không mở được Trình Quản lý Dịch vụ: %s\n"
 
-#: src/conf/gnunet-win-tool.c:120
+#: src/conf/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:123 src/conf/gnunet-win-tool.c:154
+#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Lỗi không rõ.\n"
 
-#: src/conf/gnunet-win-tool.c:135
+#: src/conf/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:147
+#: src/conf/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:151
+#: src/conf/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_callbacks.c:213
-#, c-format
-msgid "Unable to save configuration file %s:"
+#: src/conf/wizard_callbacks.c:169
+#, fuzzy, c-format
+msgid "Unable to save configuration file '%s':"
 msgstr "Không ghi được tập tin cấu hình %s:"
 
-#: src/conf/wizard_callbacks.c:236 src/conf/wizard_curs.c:517
+#: src/conf/wizard_callbacks.c:189 src/conf/wizard_curs.c:613
 msgid "Unable to create user account:"
 msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/conf/wizard_callbacks.c:243 src/conf/wizard_curs.c:520
+#: src/conf/wizard_callbacks.c:196 src/conf/wizard_curs.c:616
 msgid "Unable to change startup process:"
 msgstr "Không thay đổi được tiến trình khởi động:"
 
-#: src/conf/wizard_curs.c:50 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:118 src/conf/wizard_util.c:160
+#: src/conf/wizard_curs.c:57 src/conf/wizard_interface.c:1075
+#: src/conf/wizard_util.c:120 src/conf/wizard_util.c:162
 msgid "Error"
 msgstr "Lỗi"
 
-#: src/conf/wizard_curs.c:99 src/conf/wizard_curs.c:114
-#: src/conf/wizard_curs.c:167 src/conf/wizard_curs.c:202
-#: src/conf/wizard_curs.c:230 src/conf/wizard_curs.c:255
-#: src/conf/wizard_curs.c:287 src/conf/wizard_curs.c:313
-#: src/conf/wizard_curs.c:344 src/conf/wizard_curs.c:367
-#: src/conf/wizard_curs.c:395 src/conf/wizard_curs.c:417
-#: src/conf/wizard_curs.c:439 src/conf/wizard_curs.c:467
-#: src/conf/wizard_curs.c:497 src/conf/wizard_curs.c:582
+#: src/conf/wizard_curs.c:113 src/conf/wizard_curs.c:128
+#: src/conf/wizard_curs.c:181 src/conf/wizard_curs.c:218
+#: src/conf/wizard_curs.c:248 src/conf/wizard_curs.c:274
+#: src/conf/wizard_curs.c:307 src/conf/wizard_curs.c:334
+#: src/conf/wizard_curs.c:366 src/conf/wizard_curs.c:391
+#: src/conf/wizard_curs.c:420 src/conf/wizard_curs.c:443
+#: src/conf/wizard_curs.c:498 src/conf/wizard_curs.c:560
+#: src/conf/wizard_curs.c:591 src/conf/wizard_curs.c:635
 msgid "GNUnet configuration"
 msgstr "Cấu hình GNUnet"
 
-#: src/conf/wizard_curs.c:100 src/conf/wizard_interface.c:77
+#: src/conf/wizard_curs.c:114
+#, fuzzy
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -2435,9 +2514,9 @@
 "GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
-"\thttp://www.gnunet.org\n";
+"\thttp://gnunet.org/\n";
 "and join our community at\n"
-"\thttp://www.gnunet.org/drupal/\n";
+"\thttp://gnunet.org/drupal/\n";
 "\n"
 "Have a lot of fun,\n"
 "\n"
@@ -2456,20 +2535,20 @@
 "\n"
 "đội GNUnet"
 
-#: src/conf/wizard_curs.c:115
+#: src/conf/wizard_curs.c:129
 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:121 src/conf/wizard_curs.c:173
-#: src/conf/wizard_curs.c:208 src/conf/wizard_curs.c:260
-#: src/conf/wizard_curs.c:292 src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:188
+#: src/conf/wizard_curs.c:225 src/conf/wizard_curs.c:280
+#: src/conf/wizard_curs.c:312 src/conf/wizard_curs.c:372
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/conf/wizard_curs.c:121 src/conf/wizard_curs.c:173
+#: src/conf/wizard_curs.c:135 src/conf/wizard_curs.c:189
 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 "
@@ -2478,13 +2557,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:167
+#: src/conf/wizard_curs.c:182
 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:202
+#: src/conf/wizard_curs.c:219
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
@@ -2494,7 +2573,7 @@
 "\n"
 "Nếu không biết, hãy để trống."
 
-#: src/conf/wizard_curs.c:208
+#: src/conf/wizard_curs.c:226
 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 "
@@ -2512,7 +2591,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:230
+#: src/conf/wizard_curs.c:249
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -2529,11 +2608,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:255
+#: src/conf/wizard_curs.c:275
 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:260
+#: src/conf/wizard_curs.c:280
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2550,11 +2629,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:287
+#: src/conf/wizard_curs.c:307
 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:292
+#: src/conf/wizard_curs.c:313
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2571,7 +2650,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:313
+#: src/conf/wizard_curs.c:335
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -2593,11 +2672,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:344
+#: src/conf/wizard_curs.c:367
 msgid "How much CPU (in %) may be used?"
 msgstr "Sử dụng bao nhiêu CPU (tính theo %)?"
 
-#: src/conf/wizard_curs.c:349
+#: src/conf/wizard_curs.c:373
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -2607,7 +2686,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:367
+#: src/conf/wizard_curs.c:392
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -2629,7 +2708,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:395
+#: src/conf/wizard_curs.c:421
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -2641,7 +2720,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:417
+#: src/conf/wizard_curs.c:444
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -2654,7 +2733,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:440
+#: src/conf/wizard_curs.c:499
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -2681,7 +2760,7 @@
 "Để trống để chạy GNUnet với quyền hệ thống.\n"
 "Người dùng GNUnet:"
 
-#: src/conf/wizard_curs.c:468
+#: src/conf/wizard_curs.c:561
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -2707,7 +2786,7 @@
 "\n"
 "Nhóm GNUnet:"
 
-#: src/conf/wizard_curs.c:497
+#: src/conf/wizard_curs.c:592
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -2719,7 +2798,7 @@
 "\n"
 "Chạy nó sau khi ghi cấu hình?"
 
-#: src/conf/wizard_curs.c:576
+#: src/conf/wizard_curs.c:629
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -2736,6 +2815,35 @@
 msgid "GNUnet configuration assistant"
 msgstr "Trình giúp cấu hình GNUnet"
 
+#: src/conf/wizard_interface.c:77
+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://www.gnunet.org\n";
+"and join our community at\n"
+"\thttp://www.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/conf/wizard_interface.c:106 src/conf/wizard_interface.c:332
 #: src/conf/wizard_interface.c:651 src/conf/wizard_interface.c:1284
 msgid "Next"
@@ -2993,31 +3101,31 @@
 msgid "Can't access the service"
 msgstr "Không truy cập được dịch vụ"
 
-#: src/conf/wizard_util.c:111
+#: src/conf/wizard_util.c:112
 msgid "Can't delete the service"
 msgstr "Không xóa được dịch vụ"
 
-#: src/conf/wizard_util.c:114
+#: src/conf/wizard_util.c:116
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/conf/wizard_util.c:143
+#: src/conf/wizard_util.c:145
 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:147
+#: src/conf/wizard_util.c:149
 msgid "Error creating user"
 msgstr "Lỗi tạo người dùng"
 
-#: src/conf/wizard_util.c:150
+#: src/conf/wizard_util.c:152
 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:153
+#: src/conf/wizard_util.c:155
 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:156
+#: src/conf/wizard_util.c:158
 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"
 
@@ -3031,43 +3139,43 @@
 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:2155
+#: src/server/connection.c:2192
 #, 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:2232
+#: src/server/connection.c:2269
 #, 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:2248
+#: src/server/connection.c:2285
 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:2641
+#: src/server/connection.c:2679
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2643
+#: src/server/connection.c:2681
 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:2645
+#: src/server/connection.c:2683
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:2647
+#: src/server/connection.c:2685
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2649
+#: src/server/connection.c:2687
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2651
+#: src/server/connection.c:2689
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
@@ -3129,12 +3237,6 @@
 msgid "Print information about GNUnet peers."
 msgstr "In thông tin về các đầu peer của GNUnet."
 
-#: src/server/gnunet-peer-info.c:113 src/server/gnunet-transport-check.c:518
-#: src/server/gnunet-update.c:139
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Tham số sai: "
-
 #: 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"
@@ -3299,28 +3401,28 @@
 msgid "Updated data for %d applications.\n"
 msgstr "Cập nhật dữ liệu cho %d ứng dụng.\n"
 
-#: src/server/gnunetd.c:108
+#: src/server/gnunetd.c:115
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run '%s'!\n"
 msgstr ""
 "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: src/server/gnunetd.c:116
+#: src/server/gnunetd.c:123
 #, c-format
 msgid "'%s' starting\n"
 msgstr "'%s' đang khởi động\n"
 
-#: src/server/gnunetd.c:138
+#: src/server/gnunetd.c:145
 #, c-format
 msgid "'%s' startup complete.\n"
 msgstr "'%s' khởi động thành công.\n"
 
-#: src/server/gnunetd.c:143
+#: src/server/gnunetd.c:150
 #, c-format
 msgid "'%s' is shutting down.\n"
 msgstr "'%s' đang tắt.\n"
 
-#: src/server/handler.c:366
+#: src/server/handler.c:367
 #, 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"
@@ -3357,26 +3459,26 @@
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/startup.c:488
-#, c-format
-msgid "User '%s' not known, cannot change UID to it."
+#: src/server/startup.c:412
+#, fuzzy, c-format
+msgid "User '%s' not known, cannot change UID to it.\n"
 msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
 
-#: src/server/startup.c:499
-#, c-format
-msgid "Cannot change user/group to '%s': %s"
+#: src/server/startup.c:421
+#, fuzzy, c-format
+msgid "Cannot change user/group to '%s': %s\n"
 msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
 
-#: src/server/startup.c:518
+#: src/server/startup.c:522
 msgid "Invalid command-line arguments:\n"
 msgstr "Sai tham số dòng lệnh:\n"
 
-#: src/server/startup.c:521
+#: src/server/startup.c:525
 #, c-format
 msgid "Argument %d: '%s'\n"
 msgstr "Tham số %d: '%s'\n"
 
-#: src/server/startup.c:527
+#: src/server/startup.c:531
 msgid "Invalid command-line arguments.\n"
 msgstr "Sai tham số dòng lệnh.\n"
 
@@ -3393,7 +3495,7 @@
 msgstr ""
 "Sự xác định mạng không đúng trong phần '%s' của cấu hình cho mục '%s': %s\n"
 
-#: src/server/tcpserver.c:802
+#: src/server/tcpserver.c:806
 #, 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"
@@ -3416,7 +3518,7 @@
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr "Mong chào mừng từ kết nối http, nhận được rác. Đang đóng kết nối.\n"
 
-#: src/transports/http.c:817 src/transports/tcp.c:689 src/transports/udp.c:286
+#: src/transports/http.c:817 src/transports/tcp.c:692 src/transports/udp.c:286
 #, 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"
@@ -3425,7 +3527,7 @@
 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:1173 src/transports/tcp.c:1125 src/util/tcpio.c:166
+#: src/transports/http.c:1173 src/transports/tcp.c:1132 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -3514,24 +3616,24 @@
 "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
 "đóng.\n"
 
-#: src/transports/tcp.c:1057
+#: src/transports/tcp.c:1064
 msgid "Could not determine my public IP address.\n"
 msgstr "Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/tcp.c:1307 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:1314 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"
 
-#: src/transports/tcp.c:1424
+#: src/transports/tcp.c:1431
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:1426
+#: src/transports/tcp.c:1433
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:1428
+#: src/transports/tcp.c:1435
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
@@ -3682,18 +3784,14 @@
 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:471
+#: src/util/configuration.c:509 src/util/configuration.c:511
 #, c-format
-msgid ""
-"Configuration file '%s' not found. I will try to create the default "
-"configuration file at that location.\n"
+msgid "Configuration file '%s' not found.  Run gnunet-setup!\n"
 msgstr ""
-"Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
-"hình mặc định tại vị trí đó.\n"
 
-#: src/util/configuration.c:488
-#, c-format
-msgid "Cannot open configuration file '%s'\n"
+#: src/util/configuration.c:515
+#, 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:229
@@ -3785,7 +3883,7 @@
 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:151
+#: src/util/initialize.c:228
 msgid "Shutdown complete.\n"
 msgstr "Tắt xong.\n"
 
@@ -4038,12 +4136,46 @@
 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:1027 src/include/gnunet_util.h:1029
-#: src/include/gnunet_util.h:1036
+#: src/include/gnunet_util.h:1041 src/include/gnunet_util.h:1043
+#: src/include/gnunet_util.h:1050
 #, 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 ""
+#~ "USAGE: gnunet-setup MODULE\n"
+#~ "\n"
+#~ "MODULE\n"
+#~ " recreate\trecreate configuration files\n"
+#~ " config\t\ttext-based configuration\n"
+#~ " menuconfig\ttext-based menu\n"
+#~ " gconfig\tGTK configuration\n"
+#~ " wizard-curses\tBasic text-based graphical configuration\n"
+#~ " wizard-gtk\tBasic GTK configuration\n"
+#~ "\n"
+#~ msgstr ""
+#~ "SỬ DỤNG: gnunet-setup MÔ-ĐUN\n"
+#~ "\n"
+#~ "MÔ-ĐUN\n"
+#~ " recreate\ttạo lại các tập tin cấu hình\n"
+#~ " config\t\tcấu hình ở chế độ văn bản\n"
+#~ " menuconfig\tthực đơn ở chế độ văn bản\n"
+#~ " gconfig\tcấu hình GTK\n"
+#~ " wizard-curses\tCấu hình đồ hoạ dạng văn bản cơ bản\n"
+#~ " wizard-gtk\tCấu hình GTK cơ bản\n"
+#~ "\n"
+
+#~ msgid "Please specify a path where the configuration files will be stored."
+#~ msgstr "Xin hãy chỉ ra một đường dẫn để chứa các tập tin cấu hình."
+
+#~ msgid ""
+#~ "Configuration file '%s' not found. I will try to create the default "
+#~ "configuration file at that location.\n"
+#~ msgstr ""
+#~ "Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
+#~ "hình mặc định tại vị trí đó.\n"
+
 #~ msgid "# client trace requests received"
 #~ msgstr "# nhận được yêu cầu theo vết trace của máy khách"
 





reply via email to

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