gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r7485 - in GNUnet: . contrib po


From: gnunet
Subject: [GNUnet-SVN] r7485 - in GNUnet: . contrib po
Date: Sat, 19 Jul 2008 23:46:23 -0600 (MDT)

Author: grothoff
Date: 2008-07-19 23:46:23 -0600 (Sat, 19 Jul 2008)
New Revision: 7485

Modified:
   GNUnet/UPDATING
   GNUnet/configure.ac
   GNUnet/contrib/doxygen
   GNUnet/po/GNUnet.pot
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/todo
Log:
readying for release

Modified: GNUnet/UPDATING
===================================================================
--- GNUnet/UPDATING     2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/UPDATING     2008-07-20 05:46:23 UTC (rev 7485)
@@ -8,6 +8,12 @@
 data-preserving migration may not be possible.  For SVN versions,
 you're on your own.
 
+0.8.0 to 0.8.0a
+===============
+
+Just run gnunet-update.  This may take a while.
+
+
 0.8.0pre0 and 0.8.0pre1 to 0.8.0
 ================================
 

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/configure.ac 2008-07-20 05:46:23 UTC (rev 7485)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.61)
-AC_INIT([GNUnet], [0.8.0],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.8.0])
+AC_INIT([GNUnet], [0.8.0a],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.8.0a])
 AC_CONFIG_HEADERS([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: GNUnet/contrib/doxygen
===================================================================
--- GNUnet/contrib/doxygen      2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/contrib/doxygen      2008-07-20 05:46:23 UTC (rev 7485)
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = GNUnet
-PROJECT_NUMBER         = 0.8.0
+PROJECT_NUMBER         = 0.8.0a
 OUTPUT_DIRECTORY       = /home/gnunet/WWW/doxygen
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/po/GNUnet.pot        2008-07-20 05:46:23 UTC (rev 7485)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-14 20:51-0600\n"
+"POT-Creation-Date: 2008-07-19 23:44-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -38,9 +38,9 @@
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:118 src/setup/ncurses/wizard_curs.c:183
-#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:191
-#: src/setup/ncurses/mconf.c:289 src/setup/ncurses/mconf.c:370
-#: src/setup/ncurses/mconf.c:465
+#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:193
+#: src/setup/ncurses/mconf.c:298 src/setup/ncurses/mconf.c:381
+#: src/setup/ncurses/mconf.c:481
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
@@ -240,7 +240,7 @@
 msgid "Save configuration now?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:509
+#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:525
 msgid "GNUnet Configuration"
 msgstr ""
 
@@ -260,39 +260,39 @@
 msgid "Cancel"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:224 src/setup/ncurses/mconf.c:414
+#: src/setup/ncurses/mconf.c:229 src/setup/ncurses/mconf.c:428
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:403
+#: src/setup/ncurses/mconf.c:414
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:446
+#: src/setup/ncurses/mconf.c:460
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:454
+#: src/setup/ncurses/mconf.c:468
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:521 src/setup/text/conf.c:569
+#: src/setup/ncurses/mconf.c:537 src/setup/text/conf.c:569
 #, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:527
+#: src/setup/ncurses/mconf.c:543
 msgid "Do you wish to save your new configuration?"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:541
+#: src/setup/ncurses/mconf.c:557
 #, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:546
+#: src/setup/ncurses/mconf.c:562
 #, c-format
 msgid ""
 "\n"
@@ -359,19 +359,19 @@
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/gtk/ngconf.c:383
+#: src/setup/gtk/ngconf.c:389
 msgid "Configuration saved."
 msgstr ""
 
-#: src/setup/gtk/ngconf.c:393
+#: src/setup/gtk/ngconf.c:399
 msgid "Failed to save configuration."
 msgstr ""
 
-#: src/setup/gtk/ngconf.c:418
+#: src/setup/gtk/ngconf.c:424
 msgid "Configuration changed. Save?"
 msgstr ""
 
-#: src/setup/gtk/ngconf.c:431
+#: src/setup/gtk/ngconf.c:437
 msgid "Error saving configuration."
 msgstr ""
 
@@ -426,7 +426,7 @@
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:265
+#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:268
 msgid "print a value from the configuration file to stdout"
 msgstr ""
 
@@ -438,31 +438,31 @@
 msgid "update a value in the configuration file"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup.c:256
 #, c-format
 msgid "Too many arguments.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:263
-msgid "No interface specified, using default\n"
+#: src/setup/gnunet-setup.c:262
+msgid "No interface specified, using default.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:342
+#: src/setup/gnunet-setup.c:341
 #, c-format
 msgid "Undefined option.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:395
+#: src/setup/gnunet-setup.c:394
 #, c-format
 msgid "`%s' is not available.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:415
+#: src/setup/gnunet-setup.c:414
 #, c-format
-msgid "Unknown operation `%s'\n"
+msgid "Unknown operation '%s'.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:416 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:415 src/util/getopt/getopt.c:1072
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
@@ -644,7 +644,7 @@
 msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/setup/lib/gns.c:297
+#: src/setup/lib/gns.c:315
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -661,66 +661,71 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/error/error.c:116
+#: src/util/error/error.c:153
 #, c-format
+msgid "Message `%.*s' repeated %u times in the last %llus\n"
+msgstr ""
+
+#: src/util/error/error.c:256
+#, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:338 src/util/error/error.c:373
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:226
+#: src/util/error/error.c:340 src/util/error/error.c:375
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:342 src/util/error/error.c:379
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:344 src/util/error/error.c:381
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:346 src/util/error/error.c:383
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:348 src/util/error/error.c:385
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:350 src/util/error/error.c:387
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:352 src/util/error/error.c:389
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:354 src/util/error/error.c:391
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:356 src/util/error/error.c:393
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:209 src/util/error/error.c:246
+#: src/util/error/error.c:358 src/util/error/error.c:395
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:211
+#: src/util/error/error.c:360
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:228
+#: src/util/error/error.c:377
 msgid "INFO"
 msgstr ""
 
-#: src/util/error/error.c:247
+#: src/util/error/error.c:396
 msgid "NOTHING"
 msgstr ""
 
@@ -735,7 +740,7 @@
 
 #: src/util/network_client/tcpio.c:306
 #, c-format
-msgid "Error connecting to %s:%u\n"
+msgid "Error connecting to %s:%u. Is the daemon running?\n"
 msgstr ""
 
 #: src/util/network_client/tcpio.c:367
@@ -1000,8 +1005,8 @@
 #: src/applications/dstore_sqlite/dstore.c:376
 #: src/applications/dstore_sqlite/dstore.c:480
 #: src/applications/dstore_sqlite/dstore.c:524
-#: src/include/gnunet_util_error.h:251 src/include/gnunet_util_error.h:258
-#: src/include/gnunet_util_error.h:265
+#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
+#: src/include/gnunet_util_error.h:263
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
@@ -1011,16 +1016,21 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/os/user.c:136 src/util/os/user.c:181
+#: src/util/os/user.c:108 src/util/os/user.c:126
 #, c-format
+msgid "`%s' returned with error code %u"
+msgstr ""
+
+#: src/util/os/user.c:157 src/util/os/user.c:202
+#, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/util/os/user.c:137
+#: src/util/os/user.c:158
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:152
+#: src/util/os/user.c:173
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
@@ -1068,7 +1078,7 @@
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:432 src/util/os/osconfig.c:461
+#: src/util/os/osconfig.c:439 src/util/os/osconfig.c:468
 #, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr ""
@@ -1181,29 +1191,44 @@
 msgid "no-name"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:173
-#: src/applications/datastore/datastore.c:189
+#: src/applications/datastore/datastore.c:183
+#: src/applications/datastore/datastore.c:199
 #, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:401
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:403
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:393
+#: src/applications/datastore/datastore.c:406
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:410
+#: src/applications/datastore/datastore.c:423
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:552
+#: src/applications/datastore/datastore.c:532
+#, c-format
+msgid "Datastore conversion at approximately %u%%\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:579
+#, c-format
+msgid "Starting datastore conversion (this may take a while).\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:587
+#, c-format
+msgid "Completed datastore conversion.\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:595
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr ""
 
@@ -1414,7 +1439,7 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1456
+#: src/applications/sqstore_sqlite/sqlite.c:1457
 #: src/applications/sqstore_mysql/mysql.c:1649
 msgid "# bytes in datastore"
 msgstr ""
@@ -1904,7 +1929,7 @@
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_multipeer_test.c:77
+#: src/applications/dht/tools/dht_multipeer_test.c:76
 #: src/applications/dht/tools/dht_twopeer_test.c:47
 #: src/applications/dht/module/table.c:783
 msgid "# dht connections"
@@ -1918,28 +1943,13 @@
 msgid "allow TIME ms to process a GET command"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:91
+#: src/applications/dht/tools/dht-query.c:106
 #, c-format
-msgid "%s(%s) operation returned no results.\n"
+msgid "Issuing `%s(%s,%s)' command.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:104
-#, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:112
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:116
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:626
+#: src/applications/fs/tools/gnunet-auto-share.c:676
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr ""
@@ -2214,8 +2224,8 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:154
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-auto-share.c:199
+#: src/applications/fs/tools/gnunet-insert.c:251
 #: src/applications/fs/tools/gnunet-search.c:125
 #: src/applications/fs/tools/gnunet-download.c:77
 msgid "set the desired LEVEL of sender-anonymity"
@@ -2288,7 +2298,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:179
 #: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/applications/fs/tools/gnunet-insert.c:99
+#: src/applications/fs/tools/gnunet-insert.c:101
 #, c-format
 msgid "\tUnknown namespace `%s'\n"
 msgstr ""
@@ -2381,219 +2391,256 @@
 msgid "Listed %d matching entries.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:115
+#: src/applications/fs/tools/gnunet-auto-share.c:117
 #, c-format
+msgid "Upload of `%s' at %llu out of %llu bytes.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-auto-share.c:130
+#, c-format
 msgid "Upload of `%s' complete, URI is `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:124
-#: src/applications/fs/tools/gnunet-insert.c:223
+#: src/applications/fs/tools/gnunet-auto-share.c:139
 #, c-format
-msgid ""
-"\n"
-"Upload aborted.\n"
+msgid "Upload aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:130
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-auto-share.c:145
 #, c-format
-msgid ""
-"\n"
-"Error uploading file: %s"
+msgid "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:141
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-auto-share.c:154
 #, c-format
-msgid ""
-"\n"
-"Unexpected event: %d\n"
+msgid "Starting upload of `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:158
+#: src/applications/fs/tools/gnunet-auto-share.c:164
+#, c-format
+msgid "Uploading suspended.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-auto-share.c:179
+#, c-format
+msgid "Uploading `%s' resumed.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-auto-share.c:186
+#, c-format
+msgid "Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-auto-share.c:205
 msgid ""
 "run in debug mode; gnunet-auto-share will not daemonize and error messages "
 "will be written to stderr instead of a logfile"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:164
-#: src/applications/fs/tools/gnunet-insert.c:262
+#: src/applications/fs/tools/gnunet-auto-share.c:211
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:166
+#: src/applications/fs/tools/gnunet-auto-share.c:213
 msgid "Automatically share a directory."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:169
-#: src/applications/fs/tools/gnunet-insert.c:276
+#: src/applications/fs/tools/gnunet-auto-share.c:216
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:174
-#: src/applications/fs/tools/gnunet-insert.c:293
+#: src/applications/fs/tools/gnunet-auto-share.c:221
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:425
-#: src/applications/fs/tools/gnunet-auto-share.c:875
+#: src/applications/fs/tools/gnunet-auto-share.c:475
+#: src/applications/fs/tools/gnunet-auto-share.c:942
 #, c-format
 msgid "Could not access `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:507
+#: src/applications/fs/tools/gnunet-auto-share.c:557
 #, c-format
 msgid "Unknown keyword type `%s' in metadata configuration\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:608
+#: src/applications/fs/tools/gnunet-auto-share.c:658
 #, c-format
 msgid "Failed to stop running gnunet-auto-share.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:894
+#: src/applications/fs/tools/gnunet-auto-share.c:962
 #, c-format
 msgid "Directory `%s' is already on the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:928
+#: src/applications/fs/tools/gnunet-auto-share.c:996
 msgid ""
 "The specified directories were added to the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:952
+#: src/applications/fs/tools/gnunet-auto-share.c:1020
 #, c-format
 msgid "Could not open logfile `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:113
+#: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:118
+#: src/applications/fs/tools/gnunet-insert.c:120
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:138
+#: src/applications/fs/tools/gnunet-insert.c:140
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:146
+#: src/applications/fs/tools/gnunet-insert.c:148
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:148
+#: src/applications/fs/tools/gnunet-insert.c:150
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:201
+#: src/applications/fs/tools/gnunet-insert.c:203
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:253
+#: src/applications/fs/tools/gnunet-insert.c:225
+#, c-format
 msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:230
+#, c-format
+msgid ""
+"\n"
+"Error uploading file: %s"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:239
+#, c-format
+msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:255
+msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:258
+#: src/applications/fs/tools/gnunet-insert.c:260
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:266
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "Make files available to GNUnet for sharing."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:274
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:283
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:291
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:297
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:302
 msgid ""
 "only simulte the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:347
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:353
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:357
+#: src/applications/fs/tools/gnunet-insert.c:359
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:414
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:423
-#: src/applications/fs/tools/gnunet-insert.c:431
+#: src/applications/fs/tools/gnunet-insert.c:422
 #, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:433
+#: src/applications/fs/tools/gnunet-insert.c:441
+#, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
@@ -2791,12 +2838,12 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:395
+#: src/applications/fs/ecrs/helper.c:398
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:405
+#: src/applications/fs/ecrs/helper.c:408
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
@@ -2826,17 +2873,17 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:541
+#: src/applications/fs/ecrs/namespace.c:543
 #, c-format
 msgid "File `%s' does not contain a pseudonym, trying to remove.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:554
+#: src/applications/fs/ecrs/namespace.c:556
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:565
+#: src/applications/fs/ecrs/namespace.c:567
 #, c-format
 msgid "Format of file `%s' is invalid, trying to remove.\n"
 msgstr ""
@@ -2851,8 +2898,8 @@
 msgid "IO error."
 msgstr ""
 
-#: src/applications/fs/collection/collection.c:550
 #: src/applications/fs/collection/collection.c:553
+#: src/applications/fs/collection/collection.c:556
 #, c-format
 msgid "Revision %u"
 msgstr ""
@@ -2865,7 +2912,7 @@
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:927
+#: src/applications/fs/fsui/deserialize.c:928
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
@@ -2894,30 +2941,30 @@
 msgid "Datastore full.\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:815
+#: src/applications/fs/gap/fs.c:836
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:817
+#: src/applications/fs/gap/fs.c:838
 msgid "# gap requests dropped due to load"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:819
+#: src/applications/fs/gap/fs.c:840
 msgid "# gap content total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:821
+#: src/applications/fs/gap/fs.c:842
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:849
+#: src/applications/fs/gap/fs.c:870
 #, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
 "%d\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:905
+#: src/applications/fs/gap/fs.c:926
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -2967,43 +3014,43 @@
 msgid "# gap query bloomfilter resizing updates"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:434
+#: src/applications/fs/gap/migration.c:437
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:436
+#: src/applications/fs/gap/migration.c:439
 msgid "# blocks injected for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:438
+#: src/applications/fs/gap/migration.c:441
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:440
+#: src/applications/fs/gap/migration.c:443
 msgid "# on-demand fetches for migration"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:678
+#: src/applications/fs/gap/gap.c:689
 msgid "# gap queries dropped (table full)"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:680
+#: src/applications/fs/gap/gap.c:691
 msgid "# gap queries dropped (redundant)"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:682
+#: src/applications/fs/gap/gap.c:693
 msgid "# gap queries routed"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:684
+#: src/applications/fs/gap/gap.c:695
 msgid "# gap content found locally"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:687
+#: src/applications/fs/gap/gap.c:698
 msgid "# gap queries refreshed existing record"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:688
+#: src/applications/fs/gap/gap.c:699
 msgid "# trust earned"
 msgstr ""
 
@@ -3020,17 +3067,17 @@
 msgid "scp command is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:504
+#: src/applications/testing/remote.c:493
 #, c-format
 msgid "Friend list of %s:%d\n"
 msgstr ""
 
-#: src/applications/testing/remote.c:526
+#: src/applications/testing/remote.c:515
 #, c-format
 msgid "scp command for friend file copy is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:548
+#: src/applications/testing/remote.c:537
 #, c-format
 msgid "connecting peer %s:%d to peer %s:%d\n"
 msgstr ""
@@ -3054,7 +3101,7 @@
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/applications/testing/remotetopologies.c:481
+#: src/applications/testing/remotetopologies.c:483
 #, c-format
 msgid "Failed to establish connection with peers.\n"
 msgstr ""
@@ -3072,9 +3119,9 @@
 #: src/applications/bootstrap_http/http.c:365
 #: src/applications/bootstrap_http/http.c:375
 #: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1083
+#: src/transports/http.c:1207 src/transports/http.c:1375
+#: src/transports/http.c:1775 src/transports/http.c:1825
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -3547,19 +3594,19 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:222 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
 msgid "Core initialization failed.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:267
+#: src/server/gnunet-update.c:270
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:271 src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-update.c:274 src/server/gnunet-transport-check.c:376
 msgid "run as user LOGIN"
 msgstr ""
 
-#: src/server/gnunet-update.c:275
+#: src/server/gnunet-update.c:278
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
@@ -3800,7 +3847,7 @@
 msgid "# conn. shutdown: other peer requested it"
 msgstr ""
 
-#: src/server/handler.c:437
+#: src/server/handler.c:442
 #, c-format
 msgid "Received corrupt message from peer `%s' in %s:%d.\n"
 msgstr ""
@@ -3897,17 +3944,17 @@
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:446
+#: src/server/gnunet-transport-check.c:449
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:448
+#: src/server/gnunet-transport-check.c:451
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:496
+#: src/server/gnunet-transport-check.c:499
 #, c-format
 msgid ""
 "\n"
@@ -3968,70 +4015,70 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/http.c:2019 src/transports/tcp.c:797
+#: src/transports/http.c:2017 src/transports/tcp.c:797
 #, c-format
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"%s\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2028
+#: src/transports/http.c:2026
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:2029
+#: src/transports/http.c:2027
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:2031
+#: src/transports/http.c:2029
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/http.c:2032
+#: src/transports/http.c:2030
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2034
+#: src/transports/http.c:2032
 msgid "# HTTP GET received"
 msgstr ""
 
-#: src/transports/http.c:2035
+#: src/transports/http.c:2033
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2037
+#: src/transports/http.c:2035
 msgid "# HTTP PUT received"
 msgstr ""
 
-#: src/transports/http.c:2039
+#: src/transports/http.c:2037
 msgid "# HTTP select calls"
 msgstr ""
 
-#: src/transports/http.c:2041
+#: src/transports/http.c:2039
 msgid "# HTTP send calls"
 msgstr ""
 
-#: src/transports/http.c:2044
+#: src/transports/http.c:2042
 msgid "# HTTP curl send callbacks"
 msgstr ""
 
-#: src/transports/http.c:2046
+#: src/transports/http.c:2044
 msgid "# HTTP curl receive callbacks"
 msgstr ""
 
-#: src/transports/http.c:2048
+#: src/transports/http.c:2046
 msgid "# HTTP mhd access callbacks"
 msgstr ""
 
-#: src/transports/http.c:2050
+#: src/transports/http.c:2048
 msgid "# HTTP mhd read callbacks"
 msgstr ""
 
-#: src/transports/http.c:2052
+#: src/transports/http.c:2050
 msgid "# HTTP mhd close callbacks"
 msgstr ""
 
-#: src/transports/http.c:2054
+#: src/transports/http.c:2052
 msgid "# HTTP connect calls"
 msgstr ""
 
@@ -4102,20 +4149,20 @@
 msgid "specify host on which gnunetd is running"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:226
-#: src/include/gnunet_util_error.h:232 src/include/gnunet_util_error.h:234
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:224
+#: src/include/gnunet_util_error.h:230 src/include/gnunet_util_error.h:232
 #, c-format
 msgid "Internal error: assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:244
+#: src/include/gnunet_util_error.h:242
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d (no need to panic, we "
 "can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:272 src/include/gnunet_util_error.h:279
+#: src/include/gnunet_util_error.h:270 src/include/gnunet_util_error.h:277
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/po/de.po     2008-07-20 05:46:23 UTC (rev 7485)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-14 20:51-0600\n"
+"POT-Creation-Date: 2008-07-19 23:44-0600\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -39,9 +39,9 @@
 msgstr "Ja"
 
 #: src/setup/ncurses/wizard_curs.c:118 src/setup/ncurses/wizard_curs.c:183
-#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:191
-#: src/setup/ncurses/mconf.c:289 src/setup/ncurses/mconf.c:370
-#: src/setup/ncurses/mconf.c:465
+#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:193
+#: src/setup/ncurses/mconf.c:298 src/setup/ncurses/mconf.c:381
+#: src/setup/ncurses/mconf.c:481
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
@@ -340,7 +340,7 @@
 msgid "Save configuration now?"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:509
+#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:525
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "GNUnet Konfiguration"
@@ -361,42 +361,42 @@
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/setup/ncurses/mconf.c:224 src/setup/ncurses/mconf.c:414
+#: src/setup/ncurses/mconf.c:229 src/setup/ncurses/mconf.c:428
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:403
+#: src/setup/ncurses/mconf.c:414
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:446
+#: src/setup/ncurses/mconf.c:460
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:454
+#: src/setup/ncurses/mconf.c:468
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:521 src/setup/text/conf.c:569
+#: src/setup/ncurses/mconf.c:537 src/setup/text/conf.c:569
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/ncurses/mconf.c:527
+#: src/setup/ncurses/mconf.c:543
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/setup/ncurses/mconf.c:541
+#: src/setup/ncurses/mconf.c:557
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/setup/ncurses/mconf.c:546
+#: src/setup/ncurses/mconf.c:562
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -463,24 +463,24 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/setup/gtk/ngconf.c:383
+#: src/setup/gtk/ngconf.c:389
 #, fuzzy
 msgid "Configuration saved."
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/gtk/ngconf.c:393
+#: src/setup/gtk/ngconf.c:399
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/setup/gtk/ngconf.c:418
+#: src/setup/gtk/ngconf.c:424
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/gtk/ngconf.c:431
+#: src/setup/gtk/ngconf.c:437
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Fehler beim Speichern der Konfiguration!"
@@ -538,7 +538,7 @@
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "Generiere Konfiguration für gnunetd, den GNUnet Daemon"
 
-#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:265
+#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:268
 msgid "print a value from the configuration file to stdout"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
@@ -553,31 +553,32 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup.c:256
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: src/setup/gnunet-setup.c:263
-msgid "No interface specified, using default\n"
+#: src/setup/gnunet-setup.c:262
+#, fuzzy
+msgid "No interface specified, using default.\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/setup/gnunet-setup.c:342
+#: src/setup/gnunet-setup.c:341
 #, fuzzy, c-format
 msgid "Undefined option.\n"
 msgstr "Weitere Einstellungen"
 
-#: src/setup/gnunet-setup.c:395
+#: src/setup/gnunet-setup.c:394
 #, fuzzy, c-format
 msgid "`%s' is not available.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/setup/gnunet-setup.c:415
-#, c-format
-msgid "Unknown operation `%s'\n"
+#: src/setup/gnunet-setup.c:414
+#, fuzzy, c-format
+msgid "Unknown operation '%s'.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/setup/gnunet-setup.c:416 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:415 src/util/getopt/getopt.c:1072
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -764,7 +765,7 @@
 msgid "Unknown error while creating a new user"
 msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
 
-#: src/setup/lib/gns.c:297
+#: src/setup/lib/gns.c:315
 #, fuzzy, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -783,66 +784,71 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/error/error.c:116
+#: src/util/error/error.c:153
 #, c-format
+msgid "Message `%.*s' repeated %u times in the last %llus\n"
+msgstr ""
+
+#: src/util/error/error.c:256
+#, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:338 src/util/error/error.c:373
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/error/error.c:191 src/util/error/error.c:226
+#: src/util/error/error.c:340 src/util/error/error.c:375
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:342 src/util/error/error.c:379
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:344 src/util/error/error.c:381
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:346 src/util/error/error.c:383
 msgid "FATAL"
 msgstr "SCHWERWIEGEND"
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:348 src/util/error/error.c:385
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:350 src/util/error/error.c:387
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:352 src/util/error/error.c:389
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:354 src/util/error/error.c:391
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:356 src/util/error/error.c:393
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:209 src/util/error/error.c:246
+#: src/util/error/error.c:358 src/util/error/error.c:395
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:211
+#: src/util/error/error.c:360
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:228
+#: src/util/error/error.c:377
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:247
+#: src/util/error/error.c:396
 msgid "NOTHING"
 msgstr "NICHTS"
 
@@ -857,7 +863,7 @@
 
 #: src/util/network_client/tcpio.c:306
 #, fuzzy, c-format
-msgid "Error connecting to %s:%u\n"
+msgid "Error connecting to %s:%u. Is the daemon running?\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
 #: src/util/network_client/tcpio.c:367
@@ -1138,8 +1144,8 @@
 #: src/applications/dstore_sqlite/dstore.c:376
 #: src/applications/dstore_sqlite/dstore.c:480
 #: src/applications/dstore_sqlite/dstore.c:524
-#: src/include/gnunet_util_error.h:251 src/include/gnunet_util_error.h:258
-#: src/include/gnunet_util_error.h:265
+#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
+#: src/include/gnunet_util_error.h:263
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1149,16 +1155,21 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/os/user.c:136 src/util/os/user.c:181
+#: src/util/os/user.c:108 src/util/os/user.c:126
 #, fuzzy, c-format
+msgid "`%s' returned with error code %u"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/util/os/user.c:157 src/util/os/user.c:202
+#, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/os/user.c:137
+#: src/util/os/user.c:158
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:152
+#: src/util/os/user.c:173
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
@@ -1209,7 +1220,7 @@
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:432 src/util/os/osconfig.c:461
+#: src/util/os/osconfig.c:439 src/util/os/osconfig.c:468
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1324,30 +1335,45 @@
 msgid "no-name"
 msgstr "Name anzeigen"
 
-#: src/applications/datastore/datastore.c:173
-#: src/applications/datastore/datastore.c:189
+#: src/applications/datastore/datastore.c:183
+#: src/applications/datastore/datastore.c:199
 #, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Verfügbarkeitstest für `%s' fehlgeschlagen bei %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:401
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:403
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:393
+#: src/applications/datastore/datastore.c:406
 msgid "# bytes allowed in datastore"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/applications/datastore/datastore.c:410
+#: src/applications/datastore/datastore.c:423
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/applications/datastore/datastore.c:552
+#: src/applications/datastore/datastore.c:532
+#, c-format
+msgid "Datastore conversion at approximately %u%%\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:579
+#, fuzzy, c-format
+msgid "Starting datastore conversion (this may take a while).\n"
+msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
+
+#: src/applications/datastore/datastore.c:587
+#, c-format
+msgid "Completed datastore conversion.\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:595
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -1567,7 +1593,7 @@
 msgid "sqlite datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1456
+#: src/applications/sqstore_sqlite/sqlite.c:1457
 #: src/applications/sqstore_mysql/mysql.c:1649
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
@@ -2089,7 +2115,7 @@
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/applications/dht/tools/dht_multipeer_test.c:77
+#: src/applications/dht/tools/dht_multipeer_test.c:76
 #: src/applications/dht/tools/dht_twopeer_test.c:47
 #: src/applications/dht/module/table.c:783
 msgid "# dht connections"
@@ -2105,28 +2131,13 @@
 msgid "allow TIME ms to process a GET command"
 msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
 
-#: src/applications/dht/tools/dht-query.c:91
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:104
+#: src/applications/dht/tools/dht-query.c:106
 #, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
+msgid "Issuing `%s(%s,%s)' command.\n"
 msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/dht/tools/dht-query.c:112
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
-
-#: src/applications/dht/tools/dht-query.c:116
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
-
 #: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:626
+#: src/applications/fs/tools/gnunet-auto-share.c:676
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -2427,8 +2438,8 @@
 msgstr "# Sitzungen aufgebaut"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:154
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-auto-share.c:199
+#: src/applications/fs/tools/gnunet-insert.c:251
 #: src/applications/fs/tools/gnunet-search.c:125
 #: src/applications/fs/tools/gnunet-download.c:77
 msgid "set the desired LEVEL of sender-anonymity"
@@ -2514,7 +2525,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:179
 #: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/applications/fs/tools/gnunet-insert.c:99
+#: src/applications/fs/tools/gnunet-insert.c:101
 #, fuzzy, c-format
 msgid "\tUnknown namespace `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
@@ -2613,42 +2624,53 @@
 msgid "Listed %d matching entries.\n"
 msgstr "%d übereinstimmende Einträge aufgelistet.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:115
+#: src/applications/fs/tools/gnunet-auto-share.c:117
 #, fuzzy, c-format
+msgid "Upload of `%s' at %llu out of %llu bytes.\n"
+msgstr "Download der Datei `%s' bei %16llu von %16llu Bytes (%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:130
+#, fuzzy, c-format
 msgid "Upload of `%s' complete, URI is `%s'.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:124
-#: src/applications/fs/tools/gnunet-insert.c:223
-#, c-format
-msgid ""
-"\n"
-"Upload aborted.\n"
+#: src/applications/fs/tools/gnunet-auto-share.c:139
+#, fuzzy, c-format
+msgid "Upload aborted.\n"
 msgstr ""
 "\n"
 "Upload abgebrochen.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:130
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-auto-share.c:145
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Error uploading file: %s"
+msgid "Error uploading file: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:141
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-auto-share.c:154
+#, fuzzy, c-format
+msgid "Starting upload of `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:164
+#, fuzzy, c-format
+msgid "Uploading suspended.\n"
+msgstr "Upload abgewiesen!"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:179
+#, fuzzy, c-format
+msgid "Uploading `%s' resumed.\n"
+msgstr "Upload abgewiesen!"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:186
 #, c-format
-msgid ""
-"\n"
-"Unexpected event: %d\n"
+msgid "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:158
+#: src/applications/fs/tools/gnunet-auto-share.c:205
 #, fuzzy
 msgid ""
 "run in debug mode; gnunet-auto-share will not daemonize and error messages "
@@ -2658,8 +2680,8 @@
 "Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
 "Standardfehlerausgabe (stderr) geschrieben."
 
-#: src/applications/fs/tools/gnunet-auto-share.c:164
-#: src/applications/fs/tools/gnunet-insert.c:262
+#: src/applications/fs/tools/gnunet-auto-share.c:211
+#: src/applications/fs/tools/gnunet-insert.c:264
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -2668,12 +2690,12 @@
 "benutze libextractor um weitere direkte Referenzen zu Dateien in "
 "Verzeichnissen zu erzeugen"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:166
+#: src/applications/fs/tools/gnunet-auto-share.c:213
 msgid "Automatically share a directory."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:169
-#: src/applications/fs/tools/gnunet-insert.c:276
+#: src/applications/fs/tools/gnunet-auto-share.c:216
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2681,86 +2703,111 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:174
-#: src/applications/fs/tools/gnunet-insert.c:293
+#: src/applications/fs/tools/gnunet-auto-share.c:221
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:425
-#: src/applications/fs/tools/gnunet-auto-share.c:875
+#: src/applications/fs/tools/gnunet-auto-share.c:475
+#: src/applications/fs/tools/gnunet-auto-share.c:942
 #, fuzzy, c-format
 msgid "Could not access `%s': %s\n"
 msgstr "`%s' konnte nicht ausgeführt werden: %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:507
+#: src/applications/fs/tools/gnunet-auto-share.c:557
 #, c-format
 msgid "Unknown keyword type `%s' in metadata configuration\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:608
+#: src/applications/fs/tools/gnunet-auto-share.c:658
 #, fuzzy, c-format
 msgid "Failed to stop running gnunet-auto-share.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:894
+#: src/applications/fs/tools/gnunet-auto-share.c:962
 #, c-format
 msgid "Directory `%s' is already on the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:928
+#: src/applications/fs/tools/gnunet-auto-share.c:996
 msgid ""
 "The specified directories were added to the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:952
+#: src/applications/fs/tools/gnunet-auto-share.c:1020
 #, fuzzy, c-format
 msgid "Could not open logfile `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:113
+#: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Eintag `%s' in Namespace `%s' wurde erstellt\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:118
+#: src/applications/fs/tools/gnunet-insert.c:120
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:138
+#: src/applications/fs/tools/gnunet-insert.c:140
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:146
+#: src/applications/fs/tools/gnunet-insert.c:148
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:148
+#: src/applications/fs/tools/gnunet-insert.c:150
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 "%16llu von %16llu Bytes eingefügt (geschätzte %6s bis Fertigstellung) - %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:201
+#: src/applications/fs/tools/gnunet-insert.c:203
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Upload von `%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:253
+#: src/applications/fs/tools/gnunet-insert.c:225
+#, c-format
 msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr ""
+"\n"
+"Upload abgebrochen.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:230
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Error uploading file: %s"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:239
+#, c-format
+msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:255
+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 ""
@@ -2768,11 +2815,11 @@
 "anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
 "erzwingen."
 
-#: src/applications/fs/tools/gnunet-insert.c:258
+#: src/applications/fs/tools/gnunet-insert.c:260
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:266
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2780,11 +2827,11 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "Make files available to GNUnet for sharing."
 msgstr "Dateien GNUnet zum Filesharing zur Verfügung stellen."
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:274
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2792,13 +2839,13 @@
 "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:281
+#: src/applications/fs/tools/gnunet-insert.c:283
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2806,7 +2853,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:291
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2814,53 +2861,58 @@
 "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:297
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:302
 msgid ""
 "only simulte the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:306
 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:308
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:347
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:353
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:357
+#: src/applications/fs/tools/gnunet-insert.c:359
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:414
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Konnte nicht auf den Namespace `%s' zugreifen (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:423
-#: src/applications/fs/tools/gnunet-insert.c:431
+#: src/applications/fs/tools/gnunet-insert.c:422
+#, fuzzy, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:433
+#: src/applications/fs/tools/gnunet-insert.c:441
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -3068,12 +3120,12 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:395
+#: src/applications/fs/ecrs/helper.c:398
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
 
-#: src/applications/fs/ecrs/helper.c:405
+#: src/applications/fs/ecrs/helper.c:408
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
@@ -3104,17 +3156,17 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:541
+#: src/applications/fs/ecrs/namespace.c:543
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym, trying to remove.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:554
+#: src/applications/fs/ecrs/namespace.c:556
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:565
+#: src/applications/fs/ecrs/namespace.c:567
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid, trying to remove.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
@@ -3132,8 +3184,8 @@
 msgid "IO error."
 msgstr ""
 
-#: src/applications/fs/collection/collection.c:550
 #: src/applications/fs/collection/collection.c:553
+#: src/applications/fs/collection/collection.c:556
 #, c-format
 msgid "Revision %u"
 msgstr ""
@@ -3148,7 +3200,7 @@
 msgid "Failed to create temporary directory."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/fsui/deserialize.c:927
+#: src/applications/fs/fsui/deserialize.c:928
 #, 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"
@@ -3180,32 +3232,32 @@
 msgid "Datastore full.\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:815
+#: src/applications/fs/gap/fs.c:836
 msgid "# gap requests total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/fs/gap/fs.c:817
+#: src/applications/fs/gap/fs.c:838
 #, fuzzy
 msgid "# gap requests dropped due to load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/applications/fs/gap/fs.c:819
+#: src/applications/fs/gap/fs.c:840
 #, fuzzy
 msgid "# gap content total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/fs/gap/fs.c:821
+#: src/applications/fs/gap/fs.c:842
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:849
+#: src/applications/fs/gap/fs.c:870
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
 "%d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/gap/fs.c:905
+#: src/applications/fs/gap/fs.c:926
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
@@ -3264,49 +3316,49 @@
 msgid "# gap query bloomfilter resizing updates"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:434
+#: src/applications/fs/gap/migration.c:437
 msgid "# blocks migrated"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/gap/migration.c:436
+#: src/applications/fs/gap/migration.c:439
 #, fuzzy
 msgid "# blocks injected for migration"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/gap/migration.c:438
+#: src/applications/fs/gap/migration.c:441
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/gap/migration.c:440
+#: src/applications/fs/gap/migration.c:443
 #, fuzzy
 msgid "# on-demand fetches for migration"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/gap/gap.c:678
+#: src/applications/fs/gap/gap.c:689
 #, fuzzy
 msgid "# gap queries dropped (table full)"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/fs/gap/gap.c:680
+#: src/applications/fs/gap/gap.c:691
 #, fuzzy
 msgid "# gap queries dropped (redundant)"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/fs/gap/gap.c:682
+#: src/applications/fs/gap/gap.c:693
 #, fuzzy
 msgid "# gap queries routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/applications/fs/gap/gap.c:684
+#: src/applications/fs/gap/gap.c:695
 msgid "# gap content found locally"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:687
+#: src/applications/fs/gap/gap.c:698
 msgid "# gap queries refreshed existing record"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:688
+#: src/applications/fs/gap/gap.c:699
 #, fuzzy
 msgid "# trust earned"
 msgstr "# dht Anfragen weitergeleitet"
@@ -3324,17 +3376,17 @@
 msgid "scp command is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:504
+#: src/applications/testing/remote.c:493
 #, fuzzy, c-format
 msgid "Friend list of %s:%d\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/testing/remote.c:526
+#: src/applications/testing/remote.c:515
 #, c-format
 msgid "scp command for friend file copy is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:548
+#: src/applications/testing/remote.c:537
 #, fuzzy, c-format
 msgid "connecting peer %s:%d to peer %s:%d\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
@@ -3361,7 +3413,7 @@
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/applications/testing/remotetopologies.c:481
+#: src/applications/testing/remotetopologies.c:483
 #, fuzzy, c-format
 msgid "Failed to establish connection with peers.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
@@ -3379,9 +3431,9 @@
 #: src/applications/bootstrap_http/http.c:365
 #: src/applications/bootstrap_http/http.c:375
 #: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1083
+#: src/transports/http.c:1207 src/transports/http.c:1375
+#: src/transports/http.c:1775 src/transports/http.c:1825
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -3858,20 +3910,20 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/server/gnunet-update.c:222 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-update.c:267
+#: src/server/gnunet-update.c:270
 msgid "Updates GNUnet datastructures after version change."
 msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
 
-#: src/server/gnunet-update.c:271 src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-update.c:274 src/server/gnunet-transport-check.c:376
 msgid "run as user LOGIN"
 msgstr "als Benutzer LOGIN ausführen"
 
-#: src/server/gnunet-update.c:275
+#: src/server/gnunet-update.c:278
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 "Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
@@ -4130,7 +4182,7 @@
 msgid "# conn. shutdown: other peer requested it"
 msgstr ""
 
-#: src/server/handler.c:437
+#: src/server/handler.c:442
 #, fuzzy, 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"
@@ -4233,17 +4285,17 @@
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:446
+#: src/server/gnunet-transport-check.c:449
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/server/gnunet-transport-check.c:448
+#: src/server/gnunet-transport-check.c:451
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/server/gnunet-transport-check.c:496
+#: src/server/gnunet-transport-check.c:499
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4314,72 +4366,72 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/http.c:2019 src/transports/tcp.c:797
+#: src/transports/http.c:2017 src/transports/tcp.c:797
 #, c-format
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"%s\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2028
+#: src/transports/http.c:2026
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/transports/http.c:2029
+#: src/transports/http.c:2027
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet über HTTP"
 
-#: src/transports/http.c:2031
+#: src/transports/http.c:2029
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
-#: src/transports/http.c:2032
+#: src/transports/http.c:2030
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2034
+#: src/transports/http.c:2032
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/http.c:2035
+#: src/transports/http.c:2033
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2037
+#: src/transports/http.c:2035
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/http.c:2039
+#: src/transports/http.c:2037
 msgid "# HTTP select calls"
 msgstr ""
 
-#: src/transports/http.c:2041
+#: src/transports/http.c:2039
 msgid "# HTTP send calls"
 msgstr ""
 
-#: src/transports/http.c:2044
+#: src/transports/http.c:2042
 msgid "# HTTP curl send callbacks"
 msgstr ""
 
-#: src/transports/http.c:2046
+#: src/transports/http.c:2044
 msgid "# HTTP curl receive callbacks"
 msgstr ""
 
-#: src/transports/http.c:2048
+#: src/transports/http.c:2046
 msgid "# HTTP mhd access callbacks"
 msgstr ""
 
-#: src/transports/http.c:2050
+#: src/transports/http.c:2048
 msgid "# HTTP mhd read callbacks"
 msgstr ""
 
-#: src/transports/http.c:2052
+#: src/transports/http.c:2050
 msgid "# HTTP mhd close callbacks"
 msgstr ""
 
-#: src/transports/http.c:2054
+#: src/transports/http.c:2052
 #, fuzzy
 msgid "# HTTP connect calls"
 msgstr "# verbundener Knoten"
@@ -4453,20 +4505,20 @@
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:226
-#: src/include/gnunet_util_error.h:232 src/include/gnunet_util_error.h:234
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:224
+#: src/include/gnunet_util_error.h:230 src/include/gnunet_util_error.h:232
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:244
+#: src/include/gnunet_util_error.h:242
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d (no need to panic, we "
 "can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:272 src/include/gnunet_util_error.h:279
+#: src/include/gnunet_util_error.h:270 src/include/gnunet_util_error.h:277
 #, fuzzy, 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"
@@ -5561,6 +5613,12 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "'%s(%s,%s)' succeeded\n"
+#~ msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
+
+#~ msgid "'%s(%s,%s)' failed.\n"
+#~ msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
+
 #, fuzzy
 #~ msgid "You must specify at least one directory for sharing.\n"
 #~ msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
@@ -5933,9 +5991,6 @@
 #~ "Dateiname für UPLOAD_FILE Nachricht ist nicht Null-terminiert "
 #~ "(ungültig!)\n"
 
-#~ msgid "Upload refused!"
-#~ msgstr "Upload abgewiesen!"
-
 #~ msgid "Invalid message received at %s:%d."
 #~ msgstr "Ungültige Nachricht empfangen bei %s:%d."
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/po/es.po     2008-07-20 05:46:23 UTC (rev 7485)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-14 20:51-0600\n"
+"POT-Creation-Date: 2008-07-19 23:44-0600\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -41,9 +41,9 @@
 msgstr "Sí"
 
 #: src/setup/ncurses/wizard_curs.c:118 src/setup/ncurses/wizard_curs.c:183
-#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:191
-#: src/setup/ncurses/mconf.c:289 src/setup/ncurses/mconf.c:370
-#: src/setup/ncurses/mconf.c:465
+#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:193
+#: src/setup/ncurses/mconf.c:298 src/setup/ncurses/mconf.c:381
+#: src/setup/ncurses/mconf.c:481
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
@@ -340,7 +340,7 @@
 msgid "Save configuration now?"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:509
+#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:525
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Configuración de GNUnet"
@@ -361,41 +361,41 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/setup/ncurses/mconf.c:224 src/setup/ncurses/mconf.c:414
+#: src/setup/ncurses/mconf.c:229 src/setup/ncurses/mconf.c:428
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:403
+#: src/setup/ncurses/mconf.c:414
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:446
+#: src/setup/ncurses/mconf.c:460
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:454
+#: src/setup/ncurses/mconf.c:468
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:521 src/setup/text/conf.c:569
+#: src/setup/ncurses/mconf.c:537 src/setup/text/conf.c:569
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/ncurses/mconf.c:527
+#: src/setup/ncurses/mconf.c:543
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "¿Quieres guardar tu configuración?"
 
-#: src/setup/ncurses/mconf.c:541
+#: src/setup/ncurses/mconf.c:557
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/setup/ncurses/mconf.c:546
+#: src/setup/ncurses/mconf.c:562
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -462,23 +462,23 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Error: imposible borrar el servicio: %s\n"
 
-#: src/setup/gtk/ngconf.c:383
+#: src/setup/gtk/ngconf.c:389
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Configuración de GNUnet"
 
-#: src/setup/gtk/ngconf.c:393
+#: src/setup/gtk/ngconf.c:399
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Imposible guardar la configuración"
 
-#: src/setup/gtk/ngconf.c:418
+#: src/setup/gtk/ngconf.c:424
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/gtk/ngconf.c:431
+#: src/setup/gtk/ngconf.c:437
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Imposible guardar la configuración"
@@ -536,7 +536,7 @@
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "genera configuración para gnunetd, el demonio de GNUnet"
 
-#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:265
+#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:268
 #, fuzzy
 msgid "print a value from the configuration file to stdout"
 msgstr "Imposible guardar el fichero de configuración '%s':"
@@ -550,31 +550,32 @@
 msgid "update a value in the configuration file"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup.c:256
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: src/setup/gnunet-setup.c:263
-msgid "No interface specified, using default\n"
+#: src/setup/gnunet-setup.c:262
+#, fuzzy
+msgid "No interface specified, using default.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/setup/gnunet-setup.c:342
+#: src/setup/gnunet-setup.c:341
 #, fuzzy, c-format
 msgid "Undefined option.\n"
 msgstr "Otras configuraciones"
 
-#: src/setup/gnunet-setup.c:395
+#: src/setup/gnunet-setup.c:394
 #, fuzzy, c-format
 msgid "`%s' is not available.\n"
 msgstr "'%s' no esta disponible."
 
-#: src/setup/gnunet-setup.c:415
-#, c-format
-msgid "Unknown operation `%s'\n"
+#: src/setup/gnunet-setup.c:414
+#, fuzzy, c-format
+msgid "Unknown operation '%s'.\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/setup/gnunet-setup.c:416 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:415 src/util/getopt/getopt.c:1072
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
@@ -760,7 +761,7 @@
 msgid "Unknown error while creating a new user"
 msgstr "Error desconocido mientras se creaba un nuevo usuario"
 
-#: src/setup/lib/gns.c:297
+#: src/setup/lib/gns.c:315
 #, fuzzy, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -779,66 +780,71 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/error/error.c:116
+#: src/util/error/error.c:153
 #, c-format
+msgid "Message `%.*s' repeated %u times in the last %llus\n"
+msgstr ""
+
+#: src/util/error/error.c:256
+#, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:338 src/util/error/error.c:373
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/error/error.c:191 src/util/error/error.c:226
+#: src/util/error/error.c:340 src/util/error/error.c:375
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:342 src/util/error/error.c:379
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:344 src/util/error/error.c:381
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:346 src/util/error/error.c:383
 msgid "FATAL"
 msgstr "FATAL"
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:348 src/util/error/error.c:385
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:350 src/util/error/error.c:387
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:352 src/util/error/error.c:389
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:354 src/util/error/error.c:391
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:356 src/util/error/error.c:393
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:209 src/util/error/error.c:246
+#: src/util/error/error.c:358 src/util/error/error.c:395
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:211
+#: src/util/error/error.c:360
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:228
+#: src/util/error/error.c:377
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/error/error.c:247
+#: src/util/error/error.c:396
 msgid "NOTHING"
 msgstr "NADA"
 
@@ -854,7 +860,7 @@
 
 #: src/util/network_client/tcpio.c:306
 #, fuzzy, c-format
-msgid "Error connecting to %s:%u\n"
+msgid "Error connecting to %s:%u. Is the daemon running?\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
 #: src/util/network_client/tcpio.c:367
@@ -1125,8 +1131,8 @@
 #: src/applications/dstore_sqlite/dstore.c:376
 #: src/applications/dstore_sqlite/dstore.c:480
 #: src/applications/dstore_sqlite/dstore.c:524
-#: src/include/gnunet_util_error.h:251 src/include/gnunet_util_error.h:258
-#: src/include/gnunet_util_error.h:265
+#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
+#: src/include/gnunet_util_error.h:263
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -1136,16 +1142,21 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/util/os/user.c:136 src/util/os/user.c:181
+#: src/util/os/user.c:108 src/util/os/user.c:126
 #, fuzzy, c-format
+msgid "`%s' returned with error code %u"
+msgstr "'%s' falló con el código de error %s: %s"
+
+#: src/util/os/user.c:157 src/util/os/user.c:202
+#, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/os/user.c:137
+#: src/util/os/user.c:158
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:152
+#: src/util/os/user.c:173
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
@@ -1193,7 +1204,7 @@
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:432 src/util/os/osconfig.c:461
+#: src/util/os/osconfig.c:439 src/util/os/osconfig.c:468
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "'%s' falló con el código de error %s: %s"
@@ -1308,30 +1319,45 @@
 msgid "no-name"
 msgstr "Mostrar el nombre"
 
-#: src/applications/datastore/datastore.c:173
-#: src/applications/datastore/datastore.c:189
+#: src/applications/datastore/datastore.c:183
+#: src/applications/datastore/datastore.c:199
 #, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:401
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:403
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:393
+#: src/applications/datastore/datastore.c:406
 #, fuzzy
 msgid "# bytes allowed in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/datastore/datastore.c:410
+#: src/applications/datastore/datastore.c:423
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:552
+#: src/applications/datastore/datastore.c:532
+#, c-format
+msgid "Datastore conversion at approximately %u%%\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:579
+#, fuzzy, c-format
+msgid "Starting datastore conversion (this may take a while).\n"
+msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
+
+#: src/applications/datastore/datastore.c:587
+#, c-format
+msgid "Completed datastore conversion.\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:595
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Imposible guardar la configuración"
@@ -1550,7 +1576,7 @@
 msgid "sqlite datastore"
 msgstr "base de datos sqlite"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1456
+#: src/applications/sqstore_sqlite/sqlite.c:1457
 #: src/applications/sqstore_mysql/mysql.c:1649
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
@@ -2063,7 +2089,7 @@
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/applications/dht/tools/dht_multipeer_test.c:77
+#: src/applications/dht/tools/dht_multipeer_test.c:76
 #: src/applications/dht/tools/dht_twopeer_test.c:47
 #: src/applications/dht/module/table.c:783
 msgid "# dht connections"
@@ -2079,28 +2105,13 @@
 msgid "allow TIME ms to process a GET command"
 msgstr "Reserva TIME ms para procesar cada comando"
 
-#: src/applications/dht/tools/dht-query.c:91
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:104
+#: src/applications/dht/tools/dht-query.c:106
 #, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
+msgid "Issuing `%s(%s,%s)' command.\n"
 msgstr "'%s(%s, %s)' falló.\n"
 
-#: src/applications/dht/tools/dht-query.c:112
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
-
-#: src/applications/dht/tools/dht-query.c:116
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "'%s(%s, %s)' falló.\n"
-
 #: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:626
+#: src/applications/fs/tools/gnunet-auto-share.c:676
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -2393,8 +2404,8 @@
 msgstr "# sesiones establecidas"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:154
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-auto-share.c:199
+#: src/applications/fs/tools/gnunet-insert.c:251
 #: src/applications/fs/tools/gnunet-search.c:125
 #: src/applications/fs/tools/gnunet-download.c:77
 msgid "set the desired LEVEL of sender-anonymity"
@@ -2478,7 +2489,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:179
 #: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/applications/fs/tools/gnunet-insert.c:99
+#: src/applications/fs/tools/gnunet-insert.c:101
 #, fuzzy, c-format
 msgid "\tUnknown namespace `%s'\n"
 msgstr "Operación desconocida '%s'\n"
@@ -2575,40 +2586,51 @@
 msgid "Listed %d matching entries.\n"
 msgstr "%d entradas encontradas.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:115
+#: src/applications/fs/tools/gnunet-auto-share.c:117
 #, fuzzy, c-format
+msgid "Upload of `%s' at %llu out of %llu bytes.\n"
+msgstr "Descargado del fichero '%s' el %16llu de %16llu bytes(%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:130
+#, fuzzy, c-format
 msgid "Upload of `%s' complete, URI is `%s'.\n"
 msgstr ""
 "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
 "kbps.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:124
-#: src/applications/fs/tools/gnunet-insert.c:223
+#: src/applications/fs/tools/gnunet-auto-share.c:139
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Upload aborted.\n"
+msgid "Upload aborted.\n"
 msgstr "Descarga abortada"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:130
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-auto-share.c:145
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Error uploading file: %s"
+msgid "Error uploading file: %s\n"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:141
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-auto-share.c:154
+#, fuzzy, c-format
+msgid "Starting upload of `%s'.\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:164
+#, fuzzy, c-format
+msgid "Uploading suspended.\n"
+msgstr "¡Subida rechazada!"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:179
+#, fuzzy, c-format
+msgid "Uploading `%s' resumed.\n"
+msgstr "¡Subida rechazada!"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:186
 #, c-format
-msgid ""
-"\n"
-"Unexpected event: %d\n"
+msgid "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:158
+#: src/applications/fs/tools/gnunet-auto-share.c:205
 #, fuzzy
 msgid ""
 "run in debug mode; gnunet-auto-share will not daemonize and error messages "
@@ -2617,8 +2639,8 @@
 "se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes "
 "de error serán escritos a través de stderr en vez de en un fichero de log"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:164
-#: src/applications/fs/tools/gnunet-insert.c:262
+#: src/applications/fs/tools/gnunet-auto-share.c:211
+#: src/applications/fs/tools/gnunet-insert.c:264
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -2627,12 +2649,12 @@
 "usa libextractor para añadir referencias directas adicionales a las entradas "
 "del directorio"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:166
+#: src/applications/fs/tools/gnunet-auto-share.c:213
 msgid "Automatically share a directory."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:169
-#: src/applications/fs/tools/gnunet-insert.c:276
+#: src/applications/fs/tools/gnunet-auto-share.c:216
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2640,94 +2662,117 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:174
-#: src/applications/fs/tools/gnunet-insert.c:293
+#: src/applications/fs/tools/gnunet-auto-share.c:221
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:425
-#: src/applications/fs/tools/gnunet-auto-share.c:875
+#: src/applications/fs/tools/gnunet-auto-share.c:475
+#: src/applications/fs/tools/gnunet-auto-share.c:942
 #, fuzzy, c-format
 msgid "Could not access `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:507
+#: src/applications/fs/tools/gnunet-auto-share.c:557
 #, c-format
 msgid "Unknown keyword type `%s' in metadata configuration\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:608
+#: src/applications/fs/tools/gnunet-auto-share.c:658
 #, fuzzy, c-format
 msgid "Failed to stop running gnunet-auto-share.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:894
+#: src/applications/fs/tools/gnunet-auto-share.c:962
 #, c-format
 msgid "Directory `%s' is already on the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:928
+#: src/applications/fs/tools/gnunet-auto-share.c:996
 msgid ""
 "The specified directories were added to the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:952
+#: src/applications/fs/tools/gnunet-auto-share.c:1020
 #, fuzzy, c-format
 msgid "Could not open logfile `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:113
+#: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Creada la entrada '%s' en el espacio '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:118
+#: src/applications/fs/tools/gnunet-insert.c:120
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:138
+#: src/applications/fs/tools/gnunet-insert.c:140
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:146
+#: src/applications/fs/tools/gnunet-insert.c:148
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:148
+#: src/applications/fs/tools/gnunet-insert.c:150
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu de %16llu bytes insertados (%s estimado para completar)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:201
+#: src/applications/fs/tools/gnunet-insert.c:203
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:253
+#: src/applications/fs/tools/gnunet-insert.c:225
+#, fuzzy, c-format
 msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "Descarga abortada"
+
+#: src/applications/fs/tools/gnunet-insert.c:230
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Error uploading file: %s"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:239
+#, c-format
+msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:255
+msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr ""
 "aunque gnunetd este corriendo en el ordenador local, fuerza la creación de "
 "una copia en vez de hacer un enlace al directorio para compartir de GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:258
+#: src/applications/fs/tools/gnunet-insert.c:260
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:266
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2735,11 +2780,11 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "Make files available to GNUnet for sharing."
 msgstr "Permite a GNUnet disponer de los ficheros para compartirlos."
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:274
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2747,11 +2792,11 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:283
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2759,7 +2804,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:291
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2767,53 +2812,58 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:297
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:302
 msgid ""
 "only simulte the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:347
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:353
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:357
+#: src/applications/fs/tools/gnunet-insert.c:359
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:414
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Imposible acceder al espacio '%s' (¿no existe?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:423
-#: src/applications/fs/tools/gnunet-insert.c:431
+#: src/applications/fs/tools/gnunet-insert.c:422
+#, fuzzy, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:433
+#: src/applications/fs/tools/gnunet-insert.c:441
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
@@ -3026,12 +3076,12 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:395
+#: src/applications/fs/ecrs/helper.c:398
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Al renombrar el fichero '%s' a '%s' se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/helper.c:405
+#: src/applications/fs/ecrs/helper.c:408
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
@@ -3063,17 +3113,17 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/namespace.c:541
+#: src/applications/fs/ecrs/namespace.c:543
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym, trying to remove.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/applications/fs/ecrs/namespace.c:554
+#: src/applications/fs/ecrs/namespace.c:556
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/namespace.c:565
+#: src/applications/fs/ecrs/namespace.c:567
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid, trying to remove.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
@@ -3090,8 +3140,8 @@
 msgid "IO error."
 msgstr ""
 
-#: src/applications/fs/collection/collection.c:550
 #: src/applications/fs/collection/collection.c:553
+#: src/applications/fs/collection/collection.c:556
 #, c-format
 msgid "Revision %u"
 msgstr ""
@@ -3106,7 +3156,7 @@
 msgid "Failed to create temporary directory."
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/fs/fsui/deserialize.c:927
+#: src/applications/fs/fsui/deserialize.c:928
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
@@ -3137,31 +3187,31 @@
 msgid "Datastore full.\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:815
+#: src/applications/fs/gap/fs.c:836
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:817
+#: src/applications/fs/gap/fs.c:838
 #, fuzzy
 msgid "# gap requests dropped due to load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/fs/gap/fs.c:819
+#: src/applications/fs/gap/fs.c:840
 msgid "# gap content total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:821
+#: src/applications/fs/gap/fs.c:842
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:849
+#: src/applications/fs/gap/fs.c:870
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
 "%d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/gap/fs.c:905
+#: src/applications/fs/gap/fs.c:926
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
@@ -3218,46 +3268,46 @@
 msgid "# gap query bloomfilter resizing updates"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:434
+#: src/applications/fs/gap/migration.c:437
 msgid "# blocks migrated"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/gap/migration.c:436
+#: src/applications/fs/gap/migration.c:439
 #, fuzzy
 msgid "# blocks injected for migration"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/gap/migration.c:438
+#: src/applications/fs/gap/migration.c:441
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/gap/migration.c:440
+#: src/applications/fs/gap/migration.c:443
 #, fuzzy
 msgid "# on-demand fetches for migration"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/gap/gap.c:678
+#: src/applications/fs/gap/gap.c:689
 msgid "# gap queries dropped (table full)"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:680
+#: src/applications/fs/gap/gap.c:691
 msgid "# gap queries dropped (redundant)"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:682
+#: src/applications/fs/gap/gap.c:693
 msgid "# gap queries routed"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:684
+#: src/applications/fs/gap/gap.c:695
 msgid "# gap content found locally"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:687
+#: src/applications/fs/gap/gap.c:698
 msgid "# gap queries refreshed existing record"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:688
+#: src/applications/fs/gap/gap.c:699
 msgid "# trust earned"
 msgstr ""
 
@@ -3274,17 +3324,17 @@
 msgid "scp command is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:504
+#: src/applications/testing/remote.c:493
 #, fuzzy, c-format
 msgid "Friend list of %s:%d\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/applications/testing/remote.c:526
+#: src/applications/testing/remote.c:515
 #, c-format
 msgid "scp command for friend file copy is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:548
+#: src/applications/testing/remote.c:537
 #, fuzzy, c-format
 msgid "connecting peer %s:%d to peer %s:%d\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
@@ -3309,7 +3359,7 @@
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/applications/testing/remotetopologies.c:481
+#: src/applications/testing/remotetopologies.c:483
 #, fuzzy, c-format
 msgid "Failed to establish connection with peers.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
@@ -3327,9 +3377,9 @@
 #: src/applications/bootstrap_http/http.c:365
 #: src/applications/bootstrap_http/http.c:375
 #: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1083
+#: src/transports/http.c:1207 src/transports/http.c:1375
+#: src/transports/http.c:1775 src/transports/http.c:1825
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
@@ -3804,20 +3854,20 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/server/gnunet-update.c:222 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-update.c:267
+#: src/server/gnunet-update.c:270
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:271 src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-update.c:274 src/server/gnunet-transport-check.c:376
 msgid "run as user LOGIN"
 msgstr "ejecuta como el usuario LOGIN"
 
-#: src/server/gnunet-update.c:275
+#: src/server/gnunet-update.c:278
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
@@ -4069,7 +4119,7 @@
 msgid "# conn. shutdown: other peer requested it"
 msgstr ""
 
-#: src/server/handler.c:437
+#: src/server/handler.c:442
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s' in %s:%d.\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
@@ -4169,17 +4219,17 @@
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:446
+#: src/server/gnunet-transport-check.c:449
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/server/gnunet-transport-check.c:448
+#: src/server/gnunet-transport-check.c:451
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/server/gnunet-transport-check.c:496
+#: src/server/gnunet-transport-check.c:499
 #, c-format
 msgid ""
 "\n"
@@ -4243,73 +4293,73 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/http.c:2019 src/transports/tcp.c:797
+#: src/transports/http.c:2017 src/transports/tcp.c:797
 #, c-format
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"%s\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2028
+#: src/transports/http.c:2026
 msgid "# bytes received via HTTP"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/transports/http.c:2029
+#: src/transports/http.c:2027
 msgid "# bytes sent via HTTP"
 msgstr "# bytes mandados vía HTTP"
 
-#: src/transports/http.c:2031
+#: src/transports/http.c:2029
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
-#: src/transports/http.c:2032
+#: src/transports/http.c:2030
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2034
+#: src/transports/http.c:2032
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/http.c:2035
+#: src/transports/http.c:2033
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2037
+#: src/transports/http.c:2035
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/http.c:2039
+#: src/transports/http.c:2037
 msgid "# HTTP select calls"
 msgstr ""
 
-#: src/transports/http.c:2041
+#: src/transports/http.c:2039
 msgid "# HTTP send calls"
 msgstr ""
 
-#: src/transports/http.c:2044
+#: src/transports/http.c:2042
 msgid "# HTTP curl send callbacks"
 msgstr ""
 
-#: src/transports/http.c:2046
+#: src/transports/http.c:2044
 #, fuzzy
 msgid "# HTTP curl receive callbacks"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/http.c:2048
+#: src/transports/http.c:2046
 msgid "# HTTP mhd access callbacks"
 msgstr ""
 
-#: src/transports/http.c:2050
+#: src/transports/http.c:2048
 msgid "# HTTP mhd read callbacks"
 msgstr ""
 
-#: src/transports/http.c:2052
+#: src/transports/http.c:2050
 msgid "# HTTP mhd close callbacks"
 msgstr ""
 
-#: src/transports/http.c:2054
+#: src/transports/http.c:2052
 #, fuzzy
 msgid "# HTTP connect calls"
 msgstr "# de pares conectados"
@@ -4383,20 +4433,20 @@
 msgid "specify host on which gnunetd is running"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:226
-#: src/include/gnunet_util_error.h:232 src/include/gnunet_util_error.h:234
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:224
+#: src/include/gnunet_util_error.h:230 src/include/gnunet_util_error.h:232
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_util_error.h:244
+#: src/include/gnunet_util_error.h:242
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d (no need to panic, we "
 "can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:272 src/include/gnunet_util_error.h:279
+#: src/include/gnunet_util_error.h:270 src/include/gnunet_util_error.h:277
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
@@ -5486,6 +5536,12 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "'%s(%s,%s)' succeeded\n"
+#~ msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
+
+#~ msgid "'%s(%s,%s)' failed.\n"
+#~ msgstr "'%s(%s, %s)' falló.\n"
+
 #, fuzzy
 #~ msgid "You must specify at least one directory for sharing.\n"
 #~ msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
@@ -6070,9 +6126,6 @@
 #~ "Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en null "
 #~ "(¡inválido!)\n"
 
-#~ msgid "Upload refused!"
-#~ msgstr "¡Subida rechazada!"
-
 #~ msgid "Invalid message received at %s:%d."
 #~ msgstr "Mensaje inválido recibido en %s:%d."
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/po/sv.po     2008-07-20 05:46:23 UTC (rev 7485)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-14 20:51-0600\n"
+"POT-Creation-Date: 2008-07-19 23:44-0600\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -38,9 +38,9 @@
 msgstr "Ja"
 
 #: src/setup/ncurses/wizard_curs.c:118 src/setup/ncurses/wizard_curs.c:183
-#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:191
-#: src/setup/ncurses/mconf.c:289 src/setup/ncurses/mconf.c:370
-#: src/setup/ncurses/mconf.c:465
+#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:193
+#: src/setup/ncurses/mconf.c:298 src/setup/ncurses/mconf.c:381
+#: src/setup/ncurses/mconf.c:481
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
@@ -266,7 +266,7 @@
 msgid "Save configuration now?"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:509
+#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:525
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "GNUnet-konfiguration"
@@ -287,41 +287,41 @@
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/setup/ncurses/mconf.c:224 src/setup/ncurses/mconf.c:414
+#: src/setup/ncurses/mconf.c:229 src/setup/ncurses/mconf.c:428
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:403
+#: src/setup/ncurses/mconf.c:414
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:446
+#: src/setup/ncurses/mconf.c:460
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:454
+#: src/setup/ncurses/mconf.c:468
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:521 src/setup/text/conf.c:569
+#: src/setup/ncurses/mconf.c:537 src/setup/text/conf.c:569
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/setup/ncurses/mconf.c:527
+#: src/setup/ncurses/mconf.c:543
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "Vill du spara dina inställningar?"
 
-#: src/setup/ncurses/mconf.c:541
+#: src/setup/ncurses/mconf.c:557
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/setup/ncurses/mconf.c:546
+#: src/setup/ncurses/mconf.c:562
 #, c-format
 msgid ""
 "\n"
@@ -388,22 +388,22 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: src/setup/gtk/ngconf.c:383
+#: src/setup/gtk/ngconf.c:389
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/setup/gtk/ngconf.c:393
+#: src/setup/gtk/ngconf.c:399
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/setup/gtk/ngconf.c:418
+#: src/setup/gtk/ngconf.c:424
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/setup/gtk/ngconf.c:431
+#: src/setup/gtk/ngconf.c:437
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Kunde inte spara konfiguration!"
@@ -461,7 +461,7 @@
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:265
+#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:268
 msgid "print a value from the configuration file to stdout"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
@@ -474,31 +474,34 @@
 msgid "update a value in the configuration file"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup.c:256
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: src/setup/gnunet-setup.c:263
-msgid "No interface specified, using default\n"
+#: src/setup/gnunet-setup.c:262
+#, fuzzy
+msgid "No interface specified, using default.\n"
 msgstr ""
+"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
+"\"!\n"
 
-#: src/setup/gnunet-setup.c:342
+#: src/setup/gnunet-setup.c:341
 #, c-format
 msgid "Undefined option.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:395
+#: src/setup/gnunet-setup.c:394
 #, fuzzy, c-format
 msgid "`%s' is not available.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/setup/gnunet-setup.c:415
-#, c-format
-msgid "Unknown operation `%s'\n"
+#: src/setup/gnunet-setup.c:414
+#, fuzzy, c-format
+msgid "Unknown operation '%s'.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/setup/gnunet-setup.c:416 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:415 src/util/getopt/getopt.c:1072
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
@@ -684,7 +687,7 @@
 msgid "Unknown error while creating a new user"
 msgstr "Okänt fel vid skapandet av ny användare"
 
-#: src/setup/lib/gns.c:297
+#: src/setup/lib/gns.c:315
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -702,66 +705,71 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/error/error.c:116
+#: src/util/error/error.c:153
 #, c-format
+msgid "Message `%.*s' repeated %u times in the last %llus\n"
+msgstr ""
+
+#: src/util/error/error.c:256
+#, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:338 src/util/error/error.c:373
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:191 src/util/error/error.c:226
+#: src/util/error/error.c:340 src/util/error/error.c:375
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:342 src/util/error/error.c:379
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:344 src/util/error/error.c:381
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:346 src/util/error/error.c:383
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:348 src/util/error/error.c:385
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:350 src/util/error/error.c:387
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:352 src/util/error/error.c:389
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:354 src/util/error/error.c:391
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:356 src/util/error/error.c:393
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:209 src/util/error/error.c:246
+#: src/util/error/error.c:358 src/util/error/error.c:395
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:211
+#: src/util/error/error.c:360
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:228
+#: src/util/error/error.c:377
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:247
+#: src/util/error/error.c:396
 msgid "NOTHING"
 msgstr "INGET"
 
@@ -776,7 +784,7 @@
 
 #: src/util/network_client/tcpio.c:306
 #, fuzzy, c-format
-msgid "Error connecting to %s:%u\n"
+msgid "Error connecting to %s:%u. Is the daemon running?\n"
 msgstr ""
 "\n"
 "Fel vid avindexering av fil: %s\n"
@@ -1048,8 +1056,8 @@
 #: src/applications/dstore_sqlite/dstore.c:376
 #: src/applications/dstore_sqlite/dstore.c:480
 #: src/applications/dstore_sqlite/dstore.c:524
-#: src/include/gnunet_util_error.h:251 src/include/gnunet_util_error.h:258
-#: src/include/gnunet_util_error.h:265
+#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
+#: src/include/gnunet_util_error.h:263
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1059,16 +1067,21 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/os/user.c:136 src/util/os/user.c:181
+#: src/util/os/user.c:108 src/util/os/user.c:126
 #, fuzzy, c-format
+msgid "`%s' returned with error code %u"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/util/os/user.c:157 src/util/os/user.c:202
+#, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/os/user.c:137
+#: src/util/os/user.c:158
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:152
+#: src/util/os/user.c:173
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
@@ -1118,7 +1131,7 @@
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:432 src/util/os/osconfig.c:461
+#: src/util/os/osconfig.c:439 src/util/os/osconfig.c:468
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1233,29 +1246,44 @@
 msgid "no-name"
 msgstr "Visa namn"
 
-#: src/applications/datastore/datastore.c:173
-#: src/applications/datastore/datastore.c:189
+#: src/applications/datastore/datastore.c:183
+#: src/applications/datastore/datastore.c:199
 #, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:401
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:403
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:393
+#: src/applications/datastore/datastore.c:406
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:410
+#: src/applications/datastore/datastore.c:423
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:552
+#: src/applications/datastore/datastore.c:532
+#, c-format
+msgid "Datastore conversion at approximately %u%%\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:579
+#, fuzzy, c-format
+msgid "Starting datastore conversion (this may take a while).\n"
+msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
+
+#: src/applications/datastore/datastore.c:587
+#, c-format
+msgid "Completed datastore conversion.\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:595
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr ""
 
@@ -1466,7 +1494,7 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1456
+#: src/applications/sqstore_sqlite/sqlite.c:1457
 #: src/applications/sqstore_mysql/mysql.c:1649
 msgid "# bytes in datastore"
 msgstr ""
@@ -1963,7 +1991,7 @@
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/applications/dht/tools/dht_multipeer_test.c:77
+#: src/applications/dht/tools/dht_multipeer_test.c:76
 #: src/applications/dht/tools/dht_twopeer_test.c:47
 #: src/applications/dht/module/table.c:783
 #, fuzzy
@@ -1979,28 +2007,13 @@
 msgid "allow TIME ms to process a GET command"
 msgstr "tillåt TID ms för behandling av varje kommando"
 
-#: src/applications/dht/tools/dht-query.c:91
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:104
+#: src/applications/dht/tools/dht-query.c:106
 #, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
+msgid "Issuing `%s(%s,%s)' command.\n"
 msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/dht/tools/dht-query.c:112
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "\"%s(%s,%s)\" lyckades\n"
-
-#: src/applications/dht/tools/dht-query.c:116
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "\"%s(%s,%s)\" misslyckades.\n"
-
 #: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:626
+#: src/applications/fs/tools/gnunet-auto-share.c:676
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2282,8 +2295,8 @@
 msgstr "# sessioner etablerade"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:154
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-auto-share.c:199
+#: src/applications/fs/tools/gnunet-insert.c:251
 #: src/applications/fs/tools/gnunet-search.c:125
 #: src/applications/fs/tools/gnunet-download.c:77
 msgid "set the desired LEVEL of sender-anonymity"
@@ -2358,7 +2371,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:179
 #: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/applications/fs/tools/gnunet-insert.c:99
+#: src/applications/fs/tools/gnunet-insert.c:101
 #, fuzzy, c-format
 msgid "\tUnknown namespace `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -2453,46 +2466,57 @@
 msgid "Listed %d matching entries.\n"
 msgstr "Listade %d matchande poster.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:115
+#: src/applications/fs/tools/gnunet-auto-share.c:117
 #, fuzzy, c-format
+msgid "Upload of `%s' at %llu out of %llu bytes.\n"
+msgstr "Hämtning av fil \"%s\" vid %16llu av %16llu byte (%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:130
+#, fuzzy, c-format
 msgid "Upload of `%s' complete, URI is `%s'.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:124
-#: src/applications/fs/tools/gnunet-insert.c:223
+#: src/applications/fs/tools/gnunet-auto-share.c:139
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Upload aborted.\n"
+msgid "Upload aborted.\n"
 msgstr "Nedladdning avbruten."
 
-#: src/applications/fs/tools/gnunet-auto-share.c:130
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-auto-share.c:145
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Error uploading file: %s"
+msgid "Error uploading file: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:141
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-auto-share.c:154
+#, fuzzy, c-format
+msgid "Starting upload of `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:164
+#, fuzzy, c-format
+msgid "Uploading suspended.\n"
+msgstr "Uppladdning misslyckades.\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:179
+#, fuzzy, c-format
+msgid "Uploading `%s' resumed.\n"
+msgstr "Uppladdning vägrades!"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:186
 #, c-format
-msgid ""
-"\n"
-"Unexpected event: %d\n"
+msgid "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:158
+#: src/applications/fs/tools/gnunet-auto-share.c:205
 msgid ""
 "run in debug mode; gnunet-auto-share will not daemonize and error messages "
 "will be written to stderr instead of a logfile"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:164
-#: src/applications/fs/tools/gnunet-insert.c:262
+#: src/applications/fs/tools/gnunet-auto-share.c:211
+#: src/applications/fs/tools/gnunet-insert.c:264
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -2501,179 +2525,207 @@
 "använd libextractor för att lägga till ytterligare direktreferenser till "
 "katalogposter"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:166
+#: src/applications/fs/tools/gnunet-auto-share.c:213
 msgid "Automatically share a directory."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:169
-#: src/applications/fs/tools/gnunet-insert.c:276
+#: src/applications/fs/tools/gnunet-auto-share.c:216
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:174
-#: src/applications/fs/tools/gnunet-insert.c:293
+#: src/applications/fs/tools/gnunet-auto-share.c:221
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:425
-#: src/applications/fs/tools/gnunet-auto-share.c:875
+#: src/applications/fs/tools/gnunet-auto-share.c:475
+#: src/applications/fs/tools/gnunet-auto-share.c:942
 #, fuzzy, c-format
 msgid "Could not access `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:507
+#: src/applications/fs/tools/gnunet-auto-share.c:557
 #, c-format
 msgid "Unknown keyword type `%s' in metadata configuration\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:608
+#: src/applications/fs/tools/gnunet-auto-share.c:658
 #, fuzzy, c-format
 msgid "Failed to stop running gnunet-auto-share.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:894
+#: src/applications/fs/tools/gnunet-auto-share.c:962
 #, c-format
 msgid "Directory `%s' is already on the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:928
+#: src/applications/fs/tools/gnunet-auto-share.c:996
 msgid ""
 "The specified directories were added to the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:952
+#: src/applications/fs/tools/gnunet-auto-share.c:1020
 #, fuzzy, c-format
 msgid "Could not open logfile `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:113
+#: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:118
+#: src/applications/fs/tools/gnunet-insert.c:120
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:138
+#: src/applications/fs/tools/gnunet-insert.c:140
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:146
+#: src/applications/fs/tools/gnunet-insert.c:148
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:148
+#: src/applications/fs/tools/gnunet-insert.c:150
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu av %16llu byte inlagda (uppskattar %s till färdigställd)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:201
+#: src/applications/fs/tools/gnunet-insert.c:203
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:253
+#: src/applications/fs/tools/gnunet-insert.c:225
+#, fuzzy, c-format
 msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "Nedladdning avbruten."
+
+#: src/applications/fs/tools/gnunet-insert.c:230
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Error uploading file: %s"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:239
+#, c-format
+msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:255
+msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr ""
 "även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
 "kopia istället för att göra en länk till GNUnets utdelade katalog"
 
-#: src/applications/fs/tools/gnunet-insert.c:258
+#: src/applications/fs/tools/gnunet-insert.c:260
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:266
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "Make files available to GNUnet for sharing."
 msgstr "Gör filer tillgängliga via utdelning till GNUnet."
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:274
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:283
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:291
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:297
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:302
 msgid ""
 "only simulte the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:347
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:353
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:357
+#: src/applications/fs/tools/gnunet-insert.c:359
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:414
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:423
-#: src/applications/fs/tools/gnunet-insert.c:431
+#: src/applications/fs/tools/gnunet-insert.c:422
+#, fuzzy, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:433
+#: src/applications/fs/tools/gnunet-insert.c:441
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2883,12 +2935,12 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:395
+#: src/applications/fs/ecrs/helper.c:398
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Namnbyte på fil \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/helper.c:405
+#: src/applications/fs/ecrs/helper.c:408
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
@@ -2918,17 +2970,17 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:541
+#: src/applications/fs/ecrs/namespace.c:543
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym, trying to remove.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:554
+#: src/applications/fs/ecrs/namespace.c:556
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:565
+#: src/applications/fs/ecrs/namespace.c:567
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid, trying to remove.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -2945,8 +2997,8 @@
 msgid "IO error."
 msgstr ""
 
-#: src/applications/fs/collection/collection.c:550
 #: src/applications/fs/collection/collection.c:553
+#: src/applications/fs/collection/collection.c:556
 #, c-format
 msgid "Revision %u"
 msgstr ""
@@ -2960,7 +3012,7 @@
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:927
+#: src/applications/fs/fsui/deserialize.c:928
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
@@ -2989,30 +3041,30 @@
 msgid "Datastore full.\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:815
+#: src/applications/fs/gap/fs.c:836
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:817
+#: src/applications/fs/gap/fs.c:838
 msgid "# gap requests dropped due to load"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:819
+#: src/applications/fs/gap/fs.c:840
 msgid "# gap content total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:821
+#: src/applications/fs/gap/fs.c:842
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:849
+#: src/applications/fs/gap/fs.c:870
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
 "%d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/fs/gap/fs.c:905
+#: src/applications/fs/gap/fs.c:926
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
@@ -3063,43 +3115,43 @@
 msgid "# gap query bloomfilter resizing updates"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:434
+#: src/applications/fs/gap/migration.c:437
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:436
+#: src/applications/fs/gap/migration.c:439
 msgid "# blocks injected for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:438
+#: src/applications/fs/gap/migration.c:441
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:440
+#: src/applications/fs/gap/migration.c:443
 msgid "# on-demand fetches for migration"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:678
+#: src/applications/fs/gap/gap.c:689
 msgid "# gap queries dropped (table full)"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:680
+#: src/applications/fs/gap/gap.c:691
 msgid "# gap queries dropped (redundant)"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:682
+#: src/applications/fs/gap/gap.c:693
 msgid "# gap queries routed"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:684
+#: src/applications/fs/gap/gap.c:695
 msgid "# gap content found locally"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:687
+#: src/applications/fs/gap/gap.c:698
 msgid "# gap queries refreshed existing record"
 msgstr ""
 
-#: src/applications/fs/gap/gap.c:688
+#: src/applications/fs/gap/gap.c:699
 msgid "# trust earned"
 msgstr ""
 
@@ -3116,17 +3168,17 @@
 msgid "scp command is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:504
+#: src/applications/testing/remote.c:493
 #, fuzzy, c-format
 msgid "Friend list of %s:%d\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/applications/testing/remote.c:526
+#: src/applications/testing/remote.c:515
 #, c-format
 msgid "scp command for friend file copy is : %s \n"
 msgstr ""
 
-#: src/applications/testing/remote.c:548
+#: src/applications/testing/remote.c:537
 #, c-format
 msgid "connecting peer %s:%d to peer %s:%d\n"
 msgstr ""
@@ -3151,7 +3203,7 @@
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/applications/testing/remotetopologies.c:481
+#: src/applications/testing/remotetopologies.c:483
 #, fuzzy, c-format
 msgid "Failed to establish connection with peers.\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -3169,9 +3221,9 @@
 #: src/applications/bootstrap_http/http.c:365
 #: src/applications/bootstrap_http/http.c:375
 #: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1083
+#: src/transports/http.c:1207 src/transports/http.c:1375
+#: src/transports/http.c:1775 src/transports/http.c:1825
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -3645,20 +3697,20 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:222 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-update.c:267
+#: src/server/gnunet-update.c:270
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
-#: src/server/gnunet-update.c:271 src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-update.c:274 src/server/gnunet-transport-check.c:376
 msgid "run as user LOGIN"
 msgstr "kör som användare LOGIN"
 
-#: src/server/gnunet-update.c:275
+#: src/server/gnunet-update.c:278
 msgid "run in client mode (for getting client configuration values)"
 msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
@@ -3904,7 +3956,7 @@
 msgid "# conn. shutdown: other peer requested it"
 msgstr ""
 
-#: src/server/handler.c:437
+#: src/server/handler.c:442
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s' in %s:%d.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
@@ -4005,17 +4057,17 @@
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:446
+#: src/server/gnunet-transport-check.c:449
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/server/gnunet-transport-check.c:448
+#: src/server/gnunet-transport-check.c:451
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/server/gnunet-transport-check.c:496
+#: src/server/gnunet-transport-check.c:499
 #, c-format
 msgid ""
 "\n"
@@ -4082,70 +4134,70 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/http.c:2019 src/transports/tcp.c:797
+#: src/transports/http.c:2017 src/transports/tcp.c:797
 #, c-format
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"%s\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2028
+#: src/transports/http.c:2026
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:2029
+#: src/transports/http.c:2027
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:2031
+#: src/transports/http.c:2029
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
-#: src/transports/http.c:2032
+#: src/transports/http.c:2030
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2034
+#: src/transports/http.c:2032
 msgid "# HTTP GET received"
 msgstr ""
 
-#: src/transports/http.c:2035
+#: src/transports/http.c:2033
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2037
+#: src/transports/http.c:2035
 msgid "# HTTP PUT received"
 msgstr ""
 
-#: src/transports/http.c:2039
+#: src/transports/http.c:2037
 msgid "# HTTP select calls"
 msgstr ""
 
-#: src/transports/http.c:2041
+#: src/transports/http.c:2039
 msgid "# HTTP send calls"
 msgstr ""
 
-#: src/transports/http.c:2044
+#: src/transports/http.c:2042
 msgid "# HTTP curl send callbacks"
 msgstr ""
 
-#: src/transports/http.c:2046
+#: src/transports/http.c:2044
 msgid "# HTTP curl receive callbacks"
 msgstr ""
 
-#: src/transports/http.c:2048
+#: src/transports/http.c:2046
 msgid "# HTTP mhd access callbacks"
 msgstr ""
 
-#: src/transports/http.c:2050
+#: src/transports/http.c:2048
 msgid "# HTTP mhd read callbacks"
 msgstr ""
 
-#: src/transports/http.c:2052
+#: src/transports/http.c:2050
 msgid "# HTTP mhd close callbacks"
 msgstr ""
 
-#: src/transports/http.c:2054
+#: src/transports/http.c:2052
 #, fuzzy
 msgid "# HTTP connect calls"
 msgstr "# av anslutna parter"
@@ -4217,20 +4269,20 @@
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:226
-#: src/include/gnunet_util_error.h:232 src/include/gnunet_util_error.h:234
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:224
+#: src/include/gnunet_util_error.h:230 src/include/gnunet_util_error.h:232
 #, c-format
 msgid "Internal error: assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:244
+#: src/include/gnunet_util_error.h:242
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d (no need to panic, we "
 "can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:272 src/include/gnunet_util_error.h:279
+#: src/include/gnunet_util_error.h:270 src/include/gnunet_util_error.h:277
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
@@ -5309,6 +5361,12 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "'%s(%s,%s)' succeeded\n"
+#~ msgstr "\"%s(%s,%s)\" lyckades\n"
+
+#~ msgid "'%s(%s,%s)' failed.\n"
+#~ msgstr "\"%s(%s,%s)\" misslyckades.\n"
+
 #, fuzzy
 #~ msgid "You must specify at least one directory for sharing.\n"
 #~ msgstr "Du måste ange en och endast en fil att avindexera.\n"
@@ -5455,9 +5513,6 @@
 #~ msgid "Unindex failed."
 #~ msgstr "Avindexering misslyckades."
 
-#~ msgid "Upload failed.\n"
-#~ msgstr "Uppladdning misslyckades.\n"
-
 #~ msgid ""
 #~ "You must specify a postive number for `%s' in the configuration in "
 #~ "section `%s'.\n"
@@ -5560,9 +5615,6 @@
 #~ msgid "'..' is not allowed in file name (%s).\n"
 #~ msgstr "\"..\" tillåts inte i filnamn (%s).\n"
 
-#~ msgid "Upload refused!"
-#~ msgstr "Uppladdning vägrades!"
-
 #~ msgid "Invalid message received at %s:%d."
 #~ msgstr "Ogiltigt meddelande mottogs den %s:%d."
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/po/vi.po     2008-07-20 05:46:23 UTC (rev 7485)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0pre1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-14 20:51-0600\n"
+"POT-Creation-Date: 2008-07-19 23:44-0600\n"
 "PO-Revision-Date: 2008-06-03 17:00+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -40,9 +40,9 @@
 msgstr "Có"
 
 #: src/setup/ncurses/wizard_curs.c:118 src/setup/ncurses/wizard_curs.c:183
-#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:191
-#: src/setup/ncurses/mconf.c:289 src/setup/ncurses/mconf.c:370
-#: src/setup/ncurses/mconf.c:465
+#: src/setup/ncurses/wizard_curs.c:299 src/setup/ncurses/mconf.c:193
+#: src/setup/ncurses/mconf.c:298 src/setup/ncurses/mconf.c:381
+#: src/setup/ncurses/mconf.c:481
 msgid "Internal error! (Choice invalid?)"
 msgstr "Lỗi nội bộ (sai chọn ?)"
 
@@ -296,7 +296,7 @@
 msgid "Save configuration now?"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:509
+#: src/setup/ncurses/wizard_curs.c:539 src/setup/ncurses/mconf.c:525
 msgid "GNUnet Configuration"
 msgstr "Cấu hình GNUnet"
 
@@ -316,32 +316,32 @@
 msgid "Cancel"
 msgstr "Thôi"
 
-#: src/setup/ncurses/mconf.c:224 src/setup/ncurses/mconf.c:414
+#: src/setup/ncurses/mconf.c:229 src/setup/ncurses/mconf.c:428
 msgid "Internal error! (Value invalid?)"
 msgstr "Lỗi nội bộ (giá trị sai ?)"
 
-#: src/setup/ncurses/mconf.c:403
+#: src/setup/ncurses/mconf.c:414
 msgid "Invalid input, expecting floating point value."
 msgstr "Dữ liệu nhập sai, mong đợi giá trị chấm động."
 
-#: src/setup/ncurses/mconf.c:446
+#: src/setup/ncurses/mconf.c:460
 msgid "Invalid input, expecting integer."
 msgstr "Dữ liệu nhập sai, mong đợi số nguyên."
 
-#: src/setup/ncurses/mconf.c:454
+#: src/setup/ncurses/mconf.c:468
 msgid "Value is not in legal range."
 msgstr "Giá trị không nằm trong phạm vi được phép."
 
-#: src/setup/ncurses/mconf.c:521 src/setup/text/conf.c:569
+#: src/setup/ncurses/mconf.c:537 src/setup/text/conf.c:569
 #, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr "Cấu hình chưa thay đổi thì không cần lưu lại.\n"
 
-#: src/setup/ncurses/mconf.c:527
+#: src/setup/ncurses/mconf.c:543
 msgid "Do you wish to save your new configuration?"
 msgstr "Bạn có muốn lưu cấu hình mới không?"
 
-#: src/setup/ncurses/mconf.c:541
+#: src/setup/ncurses/mconf.c:557
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +350,7 @@
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/setup/ncurses/mconf.c:546
+#: src/setup/ncurses/mconf.c:562
 #, c-format
 msgid ""
 "\n"
@@ -419,19 +419,19 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Lỗi: không thể xoá dịch vụ : %s\n"
 
-#: src/setup/gtk/ngconf.c:383
+#: src/setup/gtk/ngconf.c:389
 msgid "Configuration saved."
 msgstr "Cấu hình đã được lưu."
 
-#: src/setup/gtk/ngconf.c:393
+#: src/setup/gtk/ngconf.c:399
 msgid "Failed to save configuration."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/setup/gtk/ngconf.c:418
+#: src/setup/gtk/ngconf.c:424
 msgid "Configuration changed. Save?"
 msgstr "Cấu hình bị thay đổi. Lưu ?"
 
-#: src/setup/gtk/ngconf.c:431
+#: src/setup/gtk/ngconf.c:437
 msgid "Error saving configuration."
 msgstr "Gặp lỗi khi lưu cấu hình."
 
@@ -493,7 +493,7 @@
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "tạo ra cấu hình cho gnunetd, trình nền GNUnet"
 
-#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:265
+#: src/setup/gnunet-setup.c:111 src/server/gnunet-update.c:268
 msgid "print a value from the configuration file to stdout"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
@@ -505,31 +505,32 @@
 msgid "update a value in the configuration file"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup.c:256
 #, c-format
 msgid "Too many arguments.\n"
 msgstr "Quá nhiều đối số.\n"
 
-#: src/setup/gnunet-setup.c:263
-msgid "No interface specified, using default\n"
+#: src/setup/gnunet-setup.c:262
+#, fuzzy
+msgid "No interface specified, using default.\n"
 msgstr "Chưa xác định giao diện nên dùng mặc định\n"
 
-#: src/setup/gnunet-setup.c:342
+#: src/setup/gnunet-setup.c:341
 #, c-format
 msgid "Undefined option.\n"
 msgstr "Tùy chọn không xác định.\n"
 
-#: src/setup/gnunet-setup.c:395
+#: src/setup/gnunet-setup.c:394
 #, c-format
 msgid "`%s' is not available.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/setup/gnunet-setup.c:415
-#, c-format
-msgid "Unknown operation `%s'\n"
+#: src/setup/gnunet-setup.c:414
+#, fuzzy, c-format
+msgid "Unknown operation '%s'.\n"
 msgstr "Không rõ thao tác « %s »\n"
 
-#: src/setup/gnunet-setup.c:416 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:415 src/util/getopt/getopt.c:1072
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
@@ -722,7 +723,7 @@
 msgid "Unknown error while creating a new user"
 msgstr "Gặp lỗi không rõ trong khi tạo một người dùng mới"
 
-#: src/setup/lib/gns.c:297
+#: src/setup/lib/gns.c:315
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -740,8 +741,13 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/error/error.c:116
+#: src/util/error/error.c:153
 #, c-format
+msgid "Message `%.*s' repeated %u times in the last %llus\n"
+msgstr ""
+
+#: src/util/error/error.c:256
+#, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
@@ -749,59 +755,59 @@
 "\n"
 "Hãy bấm bất cứ phím nào để tiếp tục.\n"
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:338 src/util/error/error.c:373
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/error/error.c:191 src/util/error/error.c:226
+#: src/util/error/error.c:340 src/util/error/error.c:375
 msgid "STATUS"
 msgstr "TRẠNG THÁI"
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:342 src/util/error/error.c:379
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:344 src/util/error/error.c:381
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:346 src/util/error/error.c:383
 msgid "FATAL"
 msgstr "NGHIÊM TRỌNG"
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:348 src/util/error/error.c:385
 msgid "USER"
 msgstr "NGƯỜI DÙNG"
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:350 src/util/error/error.c:387
 msgid "ADMIN"
 msgstr "QUẢN TRỊ"
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:352 src/util/error/error.c:389
 msgid "DEVELOPER"
 msgstr "NHÀ PHÁT TRIỂN"
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:354 src/util/error/error.c:391
 msgid "REQUEST"
 msgstr "YÊU CẦU"
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:356 src/util/error/error.c:393
 msgid "BULK"
 msgstr "HÀNG LOẠT"
 
-#: src/util/error/error.c:209 src/util/error/error.c:246
+#: src/util/error/error.c:358 src/util/error/error.c:395
 msgid "IMMEDIATE"
 msgstr "NGAY"
 
-#: src/util/error/error.c:211
+#: src/util/error/error.c:360
 msgid "ALL"
 msgstr "TẤT CẢ"
 
-#: src/util/error/error.c:228
+#: src/util/error/error.c:377
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/error/error.c:247
+#: src/util/error/error.c:396
 msgid "NOTHING"
 msgstr "KHÔNG GÌ"
 
@@ -815,8 +821,8 @@
 msgstr "Gặp lỗi cú pháp trong mục nhập cấu hình MÁY trong phần MẠNG: « %s »"
 
 #: src/util/network_client/tcpio.c:306
-#, c-format
-msgid "Error connecting to %s:%u\n"
+#, fuzzy, c-format
+msgid "Error connecting to %s:%u. Is the daemon running?\n"
 msgstr "Gặp lỗi khi kết nối tới %s:%u\n"
 
 #: src/util/network_client/tcpio.c:367
@@ -1094,8 +1100,8 @@
 #: src/applications/dstore_sqlite/dstore.c:376
 #: src/applications/dstore_sqlite/dstore.c:480
 #: src/applications/dstore_sqlite/dstore.c:524
-#: src/include/gnunet_util_error.h:251 src/include/gnunet_util_error.h:258
-#: src/include/gnunet_util_error.h:265
+#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
+#: src/include/gnunet_util_error.h:263
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
@@ -1105,16 +1111,21 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/os/user.c:136 src/util/os/user.c:181
+#: src/util/os/user.c:108 src/util/os/user.c:126
+#, fuzzy, c-format
+msgid "`%s' returned with error code %u"
+msgstr "« %s » thất bại với mã lỗi %s: %s\n"
+
+#: src/util/os/user.c:157 src/util/os/user.c:202
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/util/os/user.c:137
+#: src/util/os/user.c:158
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/os/user.c:152
+#: src/util/os/user.c:173
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
@@ -1163,7 +1174,7 @@
 msgid "Setting open descriptor limit not supported.\n"
 msgstr "Không hỗ trợ chức năng đặt giới hạn bộ mô tả còn mở.\n"
 
-#: src/util/os/osconfig.c:432 src/util/os/osconfig.c:461
+#: src/util/os/osconfig.c:439 src/util/os/osconfig.c:468
 #, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "Câu lệnh « %s » đã thất bại với mã lỗi %u\n"
@@ -1276,29 +1287,44 @@
 msgid "no-name"
 msgstr "không-tên"
 
-#: src/applications/datastore/datastore.c:173
-#: src/applications/datastore/datastore.c:189
+#: src/applications/datastore/datastore.c:183
+#: src/applications/datastore/datastore.c:199
 #, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Lỗi kiểm tra tình trạng sẵn sàng cho « %s » tại %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:401
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:403
 msgid "# bloom filter false positives"
 msgstr "# các dương giả của bộ lọc bloom"
 
-#: src/applications/datastore/datastore.c:393
+#: src/applications/datastore/datastore.c:406
 msgid "# bytes allowed in datastore"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/applications/datastore/datastore.c:410
+#: src/applications/datastore/datastore.c:423
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Lỗi nạp dịch vụ tình trạng. Không có nhưng vẫn đang thử tiếp tục.\n"
 
-#: src/applications/datastore/datastore.c:552
+#: src/applications/datastore/datastore.c:532
+#, c-format
+msgid "Datastore conversion at approximately %u%%\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:579
+#, fuzzy, c-format
+msgid "Starting datastore conversion (this may take a while).\n"
+msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
+
+#: src/applications/datastore/datastore.c:587
+#, c-format
+msgid "Completed datastore conversion.\n"
+msgstr ""
+
+#: src/applications/datastore/datastore.c:595
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
 
@@ -1516,7 +1542,7 @@
 msgid "sqlite datastore"
 msgstr "kho dữ liệu sqlite"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1456
+#: src/applications/sqstore_sqlite/sqlite.c:1457
 #: src/applications/sqstore_mysql/mysql.c:1649
 msgid "# bytes in datastore"
 msgstr "# các byte trong kho dữ liệu"
@@ -2025,7 +2051,7 @@
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/applications/dht/tools/dht_multipeer_test.c:77
+#: src/applications/dht/tools/dht_multipeer_test.c:76
 #: src/applications/dht/tools/dht_twopeer_test.c:47
 #: src/applications/dht/module/table.c:783
 msgid "# dht connections"
@@ -2039,28 +2065,13 @@
 msgid "allow TIME ms to process a GET command"
 msgstr "cho phép THỜI_GIAN mili giây để xử lý mỗi câu lệnh GET (lấy)"
 
-#: src/applications/dht/tools/dht-query.c:91
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
-msgstr "Thao tác %s(%s) không trả lại kết quả.\n"
-
-#: src/applications/dht/tools/dht-query.c:104
-#, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
+#: src/applications/dht/tools/dht-query.c:106
+#, fuzzy, c-format
+msgid "Issuing `%s(%s,%s)' command.\n"
 msgstr "Đang cấp câu lệnh « %s(%s,%s) ».\n"
 
-#: src/applications/dht/tools/dht-query.c:112
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "« %s(%s,%s) » đã thành công\n"
-
-#: src/applications/dht/tools/dht-query.c:116
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "« %s(%s,%s) » bị lỗi.\n"
-
 #: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:626
+#: src/applications/fs/tools/gnunet-auto-share.c:676
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -2349,8 +2360,8 @@
 msgstr "# các phiên chạy được thiết lập"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:154
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-auto-share.c:199
+#: src/applications/fs/tools/gnunet-insert.c:251
 #: src/applications/fs/tools/gnunet-search.c:125
 #: src/applications/fs/tools/gnunet-download.c:77
 msgid "set the desired LEVEL of sender-anonymity"
@@ -2429,7 +2440,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:179
 #: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/applications/fs/tools/gnunet-insert.c:99
+#: src/applications/fs/tools/gnunet-insert.c:101
 #, c-format
 msgid "\tUnknown namespace `%s'\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -2524,42 +2535,53 @@
 msgid "Listed %d matching entries.\n"
 msgstr "Đã liệt kê %d mục nhập tương ứng.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:115
+#: src/applications/fs/tools/gnunet-auto-share.c:117
+#, fuzzy, c-format
+msgid "Upload of `%s' at %llu out of %llu bytes.\n"
+msgstr "Tải xuống tập tin « %s » tại %16llu trên %16llu byte (%8.3f 
KiB/giây)\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:130
 #, c-format
 msgid "Upload of `%s' complete, URI is `%s'.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:124
-#: src/applications/fs/tools/gnunet-insert.c:223
-#, c-format
-msgid ""
-"\n"
-"Upload aborted.\n"
+#: src/applications/fs/tools/gnunet-auto-share.c:139
+#, fuzzy, c-format
+msgid "Upload aborted.\n"
 msgstr ""
 "\n"
 "Tải lên bị hủy bỏ.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:130
-#: src/applications/fs/tools/gnunet-insert.c:228
-#, c-format
-msgid ""
-"\n"
-"Error uploading file: %s"
+#: src/applications/fs/tools/gnunet-auto-share.c:145
+#, fuzzy, c-format
+msgid "Error uploading file: %s\n"
 msgstr ""
 "\n"
 "Gặp lỗi khi tải lên tập tin: %s"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:141
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-auto-share.c:154
+#, fuzzy, c-format
+msgid "Starting upload of `%s'.\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/applications/fs/tools/gnunet-auto-share.c:164
 #, c-format
-msgid ""
-"\n"
-"Unexpected event: %d\n"
+msgid "Uploading suspended.\n"
 msgstr ""
+
+#: src/applications/fs/tools/gnunet-auto-share.c:179
+#, c-format
+msgid "Uploading `%s' resumed.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-auto-share.c:186
+#, fuzzy, c-format
+msgid "Unexpected event: %d\n"
+msgstr ""
 "\n"
 "Gặp sự kiện bất thường: %d\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:158
+#: src/applications/fs/tools/gnunet-auto-share.c:205
 msgid ""
 "run in debug mode; gnunet-auto-share will not daemonize and error messages "
 "will be written to stderr instead of a logfile"
@@ -2568,8 +2590,8 @@
 "nền và sẽ ghi thông báo lỗi ra đầu lỗi tiêu chuẩn thay vì vào một tập tin "
 "ghi sự kiện."
 
-#: src/applications/fs/tools/gnunet-auto-share.c:164
-#: src/applications/fs/tools/gnunet-insert.c:262
+#: src/applications/fs/tools/gnunet-auto-share.c:211
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
@@ -2577,12 +2599,12 @@
 "đừng dùng libextractor để thêm các tham chiếu bổ sung vào mục nhập thư mục "
 "và/hay tập tin công bố"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:166
+#: src/applications/fs/tools/gnunet-auto-share.c:213
 msgid "Automatically share a directory."
 msgstr "Tự động chia sẻ một thư mục."
 
-#: src/applications/fs/tools/gnunet-auto-share.c:169
-#: src/applications/fs/tools/gnunet-insert.c:276
+#: src/applications/fs/tools/gnunet-auto-share.c:216
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2590,95 +2612,122 @@
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:174
-#: src/applications/fs/tools/gnunet-insert.c:293
+#: src/applications/fs/tools/gnunet-auto-share.c:221
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:425
-#: src/applications/fs/tools/gnunet-auto-share.c:875
+#: src/applications/fs/tools/gnunet-auto-share.c:475
+#: src/applications/fs/tools/gnunet-auto-share.c:942
 #, fuzzy, c-format
 msgid "Could not access `%s': %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:507
+#: src/applications/fs/tools/gnunet-auto-share.c:557
 #, c-format
 msgid "Unknown keyword type `%s' in metadata configuration\n"
 msgstr "Không rõ kiểu từ khoá « %s » trong cấu hình siêu dữ liệu\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:608
+#: src/applications/fs/tools/gnunet-auto-share.c:658
 #, fuzzy, c-format
 msgid "Failed to stop running gnunet-auto-share.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/applications/fs/tools/gnunet-auto-share.c:894
+#: src/applications/fs/tools/gnunet-auto-share.c:962
 #, c-format
 msgid "Directory `%s' is already on the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:928
+#: src/applications/fs/tools/gnunet-auto-share.c:996
 msgid ""
 "The specified directories were added to the list of shared directories.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-auto-share.c:952
+#: src/applications/fs/tools/gnunet-auto-share.c:1020
 #, fuzzy, c-format
 msgid "Could not open logfile `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:113
+#: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Đã tạo mục nhập « %s » trong không gian tên « %s »\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:118
+#: src/applications/fs/tools/gnunet-insert.c:120
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:138
+#: src/applications/fs/tools/gnunet-insert.c:140
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:146
+#: src/applications/fs/tools/gnunet-insert.c:148
 msgid "filename"
 msgstr "tên tập tin"
 
-#: src/applications/fs/tools/gnunet-insert.c:148
+#: src/applications/fs/tools/gnunet-insert.c:150
 msgid "mimetype"
 msgstr "kiểu MIME"
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 "đã chèn %16llu trên %16llu byte (sẽ hoàn thành trong khoảng %6s giây) - %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:201
+#: src/applications/fs/tools/gnunet-insert.c:203
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Hoàn thành tải lên « %s », %llu byte trong %llu giây (%8.3f KiB/giây).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:214
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:253
+#: src/applications/fs/tools/gnunet-insert.c:225
+#, c-format
 msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr ""
+"\n"
+"Tải lên bị hủy bỏ.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:230
+#, c-format
+msgid ""
+"\n"
+"Error uploading file: %s"
+msgstr ""
+"\n"
+"Gặp lỗi khi tải lên tập tin: %s"
+
+#: src/applications/fs/tools/gnunet-insert.c:239
+#, c-format
+msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+"\n"
+"Gặp sự kiện bất thường: %d\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:255
+msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr ""
 "thậm chí nếu gnunetd đang chạy trên máy cục bộ, bắt buộc tạo một bản sao "
 "thay vì tạo một liên kết đến thư mục chia sẻ của GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:258
+#: src/applications/fs/tools/gnunet-insert.c:260
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/applications/fs/tools/gnunet-insert.c:266
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2686,11 +2735,11 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "Make files available to GNUnet for sharing."
 msgstr "Làm cho các tập tin sẵn sàng qua GNUnet để chia sẻ."
 
-#: src/applications/fs/tools/gnunet-insert.c:272
+#: src/applications/fs/tools/gnunet-insert.c:274
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2698,11 +2747,11 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:283
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2710,7 +2759,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:291
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2718,25 +2767,25 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:297
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:302
 msgid ""
 "only simulte the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/applications/fs/tools/gnunet-insert.c:304
+#: src/applications/fs/tools/gnunet-insert.c:306
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:310
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2744,28 +2793,33 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:347
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:353
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:357
+#: src/applications/fs/tools/gnunet-insert.c:359
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:414
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Không thể truy cập đến không gian tên « %s » (không tồn tại ?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:423
-#: src/applications/fs/tools/gnunet-insert.c:431
+#: src/applications/fs/tools/gnunet-insert.c:422
+#, fuzzy, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:433
+#: src/applications/fs/tools/gnunet-insert.c:441
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
@@ -2973,12 +3027,12 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/applications/fs/ecrs/helper.c:395
+#: src/applications/fs/ecrs/helper.c:398
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Lỗi thay đổi tên của tập tin « %s » thành « %s »: %s\n"
 
-#: src/applications/fs/ecrs/helper.c:405
+#: src/applications/fs/ecrs/helper.c:408
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Không thể thay đổi tên tập tin « %s » thành « %s »: tập tin đã có\n"
@@ -3010,17 +3064,17 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
 
-#: src/applications/fs/ecrs/namespace.c:541
+#: src/applications/fs/ecrs/namespace.c:543
 #, c-format
 msgid "File `%s' does not contain a pseudonym, trying to remove.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/applications/fs/ecrs/namespace.c:554
+#: src/applications/fs/ecrs/namespace.c:556
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/applications/fs/ecrs/namespace.c:565
+#: src/applications/fs/ecrs/namespace.c:567
 #, c-format
 msgid "Format of file `%s' is invalid, trying to remove.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ nên thử gỡ bỏ.\n"
@@ -3037,8 +3091,8 @@
 msgid "IO error."
 msgstr "Lỗi VR."
 
-#: src/applications/fs/collection/collection.c:550
 #: src/applications/fs/collection/collection.c:553
+#: src/applications/fs/collection/collection.c:556
 #, c-format
 msgid "Revision %u"
 msgstr ""
@@ -3054,7 +3108,7 @@
 msgid "Failed to create temporary directory."
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/applications/fs/fsui/deserialize.c:927
+#: src/applications/fs/fsui/deserialize.c:928
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr "Tập tin tình trạng FSUI « %s » có lỗi cú pháp tại khoảng bù %u.\n"
@@ -3083,23 +3137,23 @@
 msgid "Datastore full.\n"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/applications/fs/gap/fs.c:815
+#: src/applications/fs/gap/fs.c:836
 msgid "# gap requests total received"
 msgstr "# tổng số yêu cầu lỗ hổng được nhận"
 
-#: src/applications/fs/gap/fs.c:817
+#: src/applications/fs/gap/fs.c:838
 msgid "# gap requests dropped due to load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/applications/fs/gap/fs.c:819
+#: src/applications/fs/gap/fs.c:840
 msgid "# gap content total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/applications/fs/gap/fs.c:821
+#: src/applications/fs/gap/fs.c:842
 msgid "# gap total trust awarded"
 msgstr "# tổng số tin cậy lỗ hổng được cấp"
 
-#: src/applications/fs/gap/fs.c:849
+#: src/applications/fs/gap/fs.c:870
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
@@ -3108,7 +3162,7 @@
 "« %s » đang đăng ký các trình điều khiển kiểu máy/trình khách %d %d %d %d %d 
%"
 "d %d và kiểu PHP %d %d\n"
 
-#: src/applications/fs/gap/fs.c:905
+#: src/applications/fs/gap/fs.c:926
 msgid "enables (anonymous) file-sharing"
 msgstr "hiệu lực chia sẻ tập tin (nặc danh)"
 
@@ -3164,43 +3218,43 @@
 msgstr ""
 "# các bản cập nhật thay đổi kích cỡ bộ lọc bloomfilter truy vấn lỗ hổng"
 
-#: src/applications/fs/gap/migration.c:434
+#: src/applications/fs/gap/migration.c:437
 msgid "# blocks migrated"
 msgstr "# các khối được nâng cấp"
 
-#: src/applications/fs/gap/migration.c:436
+#: src/applications/fs/gap/migration.c:439
 msgid "# blocks injected for migration"
 msgstr "# các khối được phun vào để nâng cấp"
 
-#: src/applications/fs/gap/migration.c:438
+#: src/applications/fs/gap/migration.c:441
 msgid "# blocks fetched for migration"
 msgstr "# các khối được lấy để nâng cấp"
 
-#: src/applications/fs/gap/migration.c:440
+#: src/applications/fs/gap/migration.c:443
 msgid "# on-demand fetches for migration"
 msgstr "# các lần lấy theo yêu cầu để nâng cấp"
 
-#: src/applications/fs/gap/gap.c:678
+#: src/applications/fs/gap/gap.c:689
 msgid "# gap queries dropped (table full)"
 msgstr "# các truy vấn lỗ hổng bị bỏ (bảng đầy)"
 
-#: src/applications/fs/gap/gap.c:680
+#: src/applications/fs/gap/gap.c:691
 msgid "# gap queries dropped (redundant)"
 msgstr "# các truy vấn lỗ hổng bị bỏ (thừa)"
 
-#: src/applications/fs/gap/gap.c:682
+#: src/applications/fs/gap/gap.c:693
 msgid "# gap queries routed"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/applications/fs/gap/gap.c:684
+#: src/applications/fs/gap/gap.c:695
 msgid "# gap content found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/applications/fs/gap/gap.c:687
+#: src/applications/fs/gap/gap.c:698
 msgid "# gap queries refreshed existing record"
 msgstr "# các truy vấn lỗ hổng đã cập nhật mục ghi đã có"
 
-#: src/applications/fs/gap/gap.c:688
+#: src/applications/fs/gap/gap.c:699
 msgid "# trust earned"
 msgstr "# độ tin cậy giành được"
 
@@ -3217,17 +3271,17 @@
 msgid "scp command is : %s \n"
 msgstr "Câu lệnh scp là: %s\n"
 
-#: src/applications/testing/remote.c:504
+#: src/applications/testing/remote.c:493
 #, c-format
 msgid "Friend list of %s:%d\n"
 msgstr "Danh sách bạn bè của %s:%d\n"
 
-#: src/applications/testing/remote.c:526
+#: src/applications/testing/remote.c:515
 #, c-format
 msgid "scp command for friend file copy is : %s \n"
 msgstr "Câu lệnh scp cho bản sao tập tin bạn bè là: %s\n"
 
-#: src/applications/testing/remote.c:548
+#: src/applications/testing/remote.c:537
 #, c-format
 msgid "connecting peer %s:%d to peer %s:%d\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
@@ -3253,7 +3307,7 @@
 "Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u hàng, %"
 "u cột\n"
 
-#: src/applications/testing/remotetopologies.c:481
+#: src/applications/testing/remotetopologies.c:483
 #, c-format
 msgid "Failed to establish connection with peers.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
@@ -3271,9 +3325,9 @@
 #: src/applications/bootstrap_http/http.c:365
 #: src/applications/bootstrap_http/http.c:375
 #: src/applications/bootstrap_http/http.c:385 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:541 src/transports/http.c:1085
-#: src/transports/http.c:1209 src/transports/http.c:1377
-#: src/transports/http.c:1777 src/transports/http.c:1827
+#: src/transports/upnp/upnp.c:541 src/transports/http.c:1083
+#: src/transports/http.c:1207 src/transports/http.c:1375
+#: src/transports/http.c:1775 src/transports/http.c:1825
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -3753,19 +3807,19 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/server/gnunet-update.c:222 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:225 src/server/gnunetd.c:124
 msgid "Core initialization failed.\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/server/gnunet-update.c:267
+#: src/server/gnunet-update.c:270
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
 
-#: src/server/gnunet-update.c:271 src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-update.c:274 src/server/gnunet-transport-check.c:376
 msgid "run as user LOGIN"
 msgstr "chạy dưới người dùng ĐĂNG_NHẬP"
 
-#: src/server/gnunet-update.c:275
+#: src/server/gnunet-update.c:278
 msgid "run in client mode (for getting client configuration values)"
 msgstr "chạy trong chế độ khách (để lấy các giá trị cấu hình của máy khách)"
 
@@ -4018,7 +4072,7 @@
 msgid "# conn. shutdown: other peer requested it"
 msgstr "# kết nối bị ngắt: theo yêu cầu của đồng đẳng khác"
 
-#: src/server/handler.c:437
+#: src/server/handler.c:442
 #, c-format
 msgid "Received corrupt message from peer `%s' in %s:%d.\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
@@ -4122,17 +4176,17 @@
 msgid "repeat each test X times"
 msgstr "lặp lại mỗi hàm thử X lần"
 
-#: src/server/gnunet-transport-check.c:446
+#: src/server/gnunet-transport-check.c:449
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/server/gnunet-transport-check.c:448
+#: src/server/gnunet-transport-check.c:451
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Các truyền tải sẵn sàng: %s\n"
 
-#: src/server/gnunet-transport-check.c:496
+#: src/server/gnunet-transport-check.c:499
 #, c-format
 msgid ""
 "\n"
@@ -4197,7 +4251,7 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr "upnp: địa chỉ IP được NAT trả về: %s\n"
 
-#: src/transports/http.c:2019 src/transports/tcp.c:797
+#: src/transports/http.c:2017 src/transports/tcp.c:797
 #, c-format
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
@@ -4206,63 +4260,63 @@
 "Dịch vụ UPnP không thể nạp được. Để tắt UPnP, đặt tùy chọn cấu hình « UPNP » "
 "trong phần « %s » thành « NO » (không).\n"
 
-#: src/transports/http.c:2028
+#: src/transports/http.c:2026
 msgid "# bytes received via HTTP"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/transports/http.c:2029
+#: src/transports/http.c:2027
 msgid "# bytes sent via HTTP"
 msgstr "# các byte đã gửi qua HTTP"
 
-#: src/transports/http.c:2031
+#: src/transports/http.c:2029
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# các byte loại bỏ bởi HTTP (đi ra)"
 
-#: src/transports/http.c:2032
+#: src/transports/http.c:2030
 msgid "# HTTP GET issued"
 msgstr "# Tín hiệu HTTP GET được gửi"
 
-#: src/transports/http.c:2034
+#: src/transports/http.c:2032
 msgid "# HTTP GET received"
 msgstr "# Tín hiệu HTTP GET được nhận"
 
-#: src/transports/http.c:2035
+#: src/transports/http.c:2033
 msgid "# HTTP PUT issued"
 msgstr "# Tín hiệu HTTP PUT được gửi"
 
-#: src/transports/http.c:2037
+#: src/transports/http.c:2035
 msgid "# HTTP PUT received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/transports/http.c:2039
+#: src/transports/http.c:2037
 msgid "# HTTP select calls"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/transports/http.c:2041
+#: src/transports/http.c:2039
 msgid "# HTTP send calls"
 msgstr "# các cuộc gọi HTTP send (gửi)"
 
-#: src/transports/http.c:2044
+#: src/transports/http.c:2042
 msgid "# HTTP curl send callbacks"
 msgstr "# các cuộc gọi ngược HTTP curl send (hàm curl gửi)"
 
-#: src/transports/http.c:2046
+#: src/transports/http.c:2044
 msgid "# HTTP curl receive callbacks"
 msgstr "# các cuộc gọi ngược HTTP curl receive (hàm curl nhận)"
 
-#: src/transports/http.c:2048
+#: src/transports/http.c:2046
 msgid "# HTTP mhd access callbacks"
 msgstr "# các cuộc gọi ngược HTTP mhd access (hàm mhd truy cập)"
 
-#: src/transports/http.c:2050
+#: src/transports/http.c:2048
 msgid "# HTTP mhd read callbacks"
 msgstr "# các cuộc gọi ngược HTTP mhd read (hàm mhd đọc)"
 
-#: src/transports/http.c:2052
+#: src/transports/http.c:2050
 msgid "# HTTP mhd close callbacks"
 msgstr "# các cuộc gọi ngược HTTP mhd close (hàm mhd đóng)"
 
-#: src/transports/http.c:2054
+#: src/transports/http.c:2052
 msgid "# HTTP connect calls"
 msgstr "# các cuộc gọi HTTP connect (kết nối)"
 
@@ -4333,13 +4387,13 @@
 msgid "specify host on which gnunetd is running"
 msgstr "ghi rõ máy trên đó chạy trình nền gnunetd"
 
-#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:226
-#: src/include/gnunet_util_error.h:232 src/include/gnunet_util_error.h:234
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:224
+#: src/include/gnunet_util_error.h:230 src/include/gnunet_util_error.h:232
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d trong %s.\n"
 
-#: src/include/gnunet_util_error.h:244
+#: src/include/gnunet_util_error.h:242
 #, fuzzy, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d (no need to panic, we "
@@ -4348,7 +4402,7 @@
 "Xâm phạm giao thức bên ngoài: khẳng định không thành công tại %s:%d trong %s "
 "(đừng lo, chúng ta có thể sửa chữa).\n"
 
-#: src/include/gnunet_util_error.h:272 src/include/gnunet_util_error.h:279
+#: src/include/gnunet_util_error.h:270 src/include/gnunet_util_error.h:277
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d trong %s với lỗi: %s\n"
@@ -5438,6 +5492,15 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "%s(%s) operation returned no results.\n"
+#~ msgstr "Thao tác %s(%s) không trả lại kết quả.\n"
+
+#~ msgid "'%s(%s,%s)' succeeded\n"
+#~ msgstr "« %s(%s,%s) » đã thành công\n"
+
+#~ msgid "'%s(%s,%s)' failed.\n"
+#~ msgstr "« %s(%s,%s) » bị lỗi.\n"
+
 #, fuzzy
 #~ msgid "You must specify at least one directory for sharing.\n"
 #~ msgstr "Phải ghi rõ chỉ một thư mục để chia sẻ.\n"

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2008-07-20 05:20:51 UTC (rev 7484)
+++ GNUnet/todo 2008-07-20 05:46:23 UTC (rev 7485)
@@ -1,9 +1,5 @@
 This is just the current plan, plans change.
 
-Hostlist for network testing (0.8.x network):
-http://vserver1236.vserver-on.de/hostlist-074
-
-
 0.8.1 [8'08] (aka "growth"):
 - Publishing:
   * clean up indexing with gnunet-insert (#1107)





reply via email to

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