gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r20480 - in gnunet: contrib/hellos po src/peerinfo


From: gnunet
Subject: [GNUnet-SVN] r20480 - in gnunet: contrib/hellos po src/peerinfo
Date: Tue, 13 Mar 2012 15:45:51 +0100

Author: grothoff
Date: 2012-03-13 15:45:50 +0100 (Tue, 13 Mar 2012)
New Revision: 20480

Added:
   gnunet/contrib/hellos/02UK
   gnunet/contrib/hellos/1G1M
   gnunet/contrib/hellos/7RAV
   gnunet/contrib/hellos/8B4T
   gnunet/contrib/hellos/94CH
   gnunet/contrib/hellos/ATF4
   gnunet/contrib/hellos/F1GT
   gnunet/contrib/hellos/KD9V
   gnunet/contrib/hellos/KUPL
   gnunet/contrib/hellos/LJR8
   gnunet/contrib/hellos/R69Q
   gnunet/contrib/hellos/R6OV
   gnunet/contrib/hellos/RL7P
Removed:
   
gnunet/contrib/hellos/02UKDQ8B827SF4HR5D57BAIQA2A7IJ96EP15APKS08SE6EI90CDM35QAT4135KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O
   
gnunet/contrib/hellos/1G1MOK6389P2HV5DUK7RH3BLASHGMMVNUFFC2C26NO93SRSRQBQ9GALGBFMR1IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0
   
gnunet/contrib/hellos/7RAVI0QOIAVHL0TE0F54JQL4FUAEQ8V6PL8U1RNDRMRU33E2HU7D0IUBKUDQGTCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G
   
gnunet/contrib/hellos/8B4TV9KRVBMHNPFIP8ISM4GRNR8EAJ39JBQNRRE1QRLTLPOQGEV9S9285D9GEMNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28
   
gnunet/contrib/hellos/94CH5M5L43QCBDJBPVUA3SJT4L92P8IS3JQ0J3V0EE6QSG9P7OM03KGJD58LNB1HNNEE7Q830GQJSPM7LBKR1CP4KSMMPQ80M8GSPTG
   
gnunet/contrib/hellos/ATF475IOUC8E9A6208VK1RP2STLI3J1E7NP1CKAL5O4L3KP65RM20SKTHEBHFI0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G
   
gnunet/contrib/hellos/F1GTBM1J301AEJNJCMOMGTR3DLRHFOUMOQ504SPSVTBS47AOD4H6GMN46J9UMFUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO
   
gnunet/contrib/hellos/KD9VVK7H5TJII7OEOMCK9AI5H6EKABCO85OHPPEO72T2K6QGE9IG0LUQTOKOSJSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0
   
gnunet/contrib/hellos/KUPL5G20GSVQQ29GOD7QMTC4IRQ67KGSQ1IOMOIQL7TE78L8UQ2V9SNJQTSIEQ29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0
   
gnunet/contrib/hellos/LJR8FV49LJJOCPJFS5894IVT9RU10TENLAM1D61J83BQN629NE1OU56GM54DMIAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG
   
gnunet/contrib/hellos/R69QGJB2I9T359F3CLA5HDV9NQUDF87FQQH9F8DKIQUCRAQSPJ1FIF3GVL9QIJ8JDLQA5MS09EBVATKUKVFP8RK5Q8QA0LMRIIUTD70
   
gnunet/contrib/hellos/R6OVGTG5M5EKRS0MBLGI5VEOG360RCJS2TCUU7OCTGKN5CSBIGCC7C75IU6J1P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8
   
gnunet/contrib/hellos/RL7P1AO4M4LOI3JPVER5FJKG6A847K3O86NS4Q07J1721371FO7RB6IFVMNI1NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0
Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/peerinfo/gnunet-service-peerinfo.c
Log:
-support truncated HELLO names to work with 99-character per filename 
limitations of tar

Copied: gnunet/contrib/hellos/02UK (from rev 20479, 
gnunet/contrib/hellos/02UKDQ8B827SF4HR5D57BAIQA2A7IJ96EP15APKS08SE6EI90CDM35QAT4135KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/02UKDQ8B827SF4HR5D57BAIQA2A7IJ96EP15APKS08SE6EI90CDM35QAT4135KH7IPB4DMKVRNDJOUHOIBQ2JBIAIOHPSJHUGGBL30O
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/1G1M (from rev 20479, 
gnunet/contrib/hellos/1G1MOK6389P2HV5DUK7RH3BLASHGMMVNUFFC2C26NO93SRSRQBQ9GALGBFMR1IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/1G1MOK6389P2HV5DUK7RH3BLASHGMMVNUFFC2C26NO93SRSRQBQ9GALGBFMR1IC71608CPU0EB4FRFIDDI15S81G5UC00D7PQKI3JS0
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/7RAV (from rev 20479, 
gnunet/contrib/hellos/7RAVI0QOIAVHL0TE0F54JQL4FUAEQ8V6PL8U1RNDRMRU33E2HU7D0IUBKUDQGTCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/7RAVI0QOIAVHL0TE0F54JQL4FUAEQ8V6PL8U1RNDRMRU33E2HU7D0IUBKUDQGTCIQTUEJSRJ9V0IU9TRVTLDUPLNEACRI5BOGQTPC4G
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/8B4T (from rev 20479, 
gnunet/contrib/hellos/8B4TV9KRVBMHNPFIP8ISM4GRNR8EAJ39JBQNRRE1QRLTLPOQGEV9S9285D9GEMNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/8B4TV9KRVBMHNPFIP8ISM4GRNR8EAJ39JBQNRRE1QRLTLPOQGEV9S9285D9GEMNCDUG1SST0HNF40IFEHVAUOVI7AME8T4QPD089H28
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/94CH (from rev 20479, 
gnunet/contrib/hellos/94CH5M5L43QCBDJBPVUA3SJT4L92P8IS3JQ0J3V0EE6QSG9P7OM03KGJD58LNB1HNNEE7Q830GQJSPM7LBKR1CP4KSMMPQ80M8GSPTG)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/94CH5M5L43QCBDJBPVUA3SJT4L92P8IS3JQ0J3V0EE6QSG9P7OM03KGJD58LNB1HNNEE7Q830GQJSPM7LBKR1CP4KSMMPQ80M8GSPTG
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/ATF4 (from rev 20479, 
gnunet/contrib/hellos/ATF475IOUC8E9A6208VK1RP2STLI3J1E7NP1CKAL5O4L3KP65RM20SKTHEBHFI0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/ATF475IOUC8E9A6208VK1RP2STLI3J1E7NP1CKAL5O4L3KP65RM20SKTHEBHFI0TMOETLKQQN3K5PGBLKA1O6USS6CEOED75BOEFJ0G
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/F1GT (from rev 20479, 
gnunet/contrib/hellos/F1GTBM1J301AEJNJCMOMGTR3DLRHFOUMOQ504SPSVTBS47AOD4H6GMN46J9UMFUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/F1GTBM1J301AEJNJCMOMGTR3DLRHFOUMOQ504SPSVTBS47AOD4H6GMN46J9UMFUU2OMV082E2VMCOR71ONQBB73IO296RCJHSK73MDO
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/KD9V (from rev 20479, 
gnunet/contrib/hellos/KD9VVK7H5TJII7OEOMCK9AI5H6EKABCO85OHPPEO72T2K6QGE9IG0LUQTOKOSJSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/KD9VVK7H5TJII7OEOMCK9AI5H6EKABCO85OHPPEO72T2K6QGE9IG0LUQTOKOSJSNR9I7HF0CVPJ6C464EM7LMPTVRPU75MP6OIRJQJ0
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/KUPL (from rev 20479, 
gnunet/contrib/hellos/KUPL5G20GSVQQ29GOD7QMTC4IRQ67KGSQ1IOMOIQL7TE78L8UQ2V9SNJQTSIEQ29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/KUPL5G20GSVQQ29GOD7QMTC4IRQ67KGSQ1IOMOIQL7TE78L8UQ2V9SNJQTSIEQ29F7JGPV6VNKG509S048CH31NQH8VIH2T58K8PVM0
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/LJR8 (from rev 20479, 
gnunet/contrib/hellos/LJR8FV49LJJOCPJFS5894IVT9RU10TENLAM1D61J83BQN629NE1OU56GM54DMIAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/LJR8FV49LJJOCPJFS5894IVT9RU10TENLAM1D61J83BQN629NE1OU56GM54DMIAKS4DAE6UFJBO4BRKDLIOI2OVS6J480QLOGIEPRDG
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/R69Q (from rev 20479, 
gnunet/contrib/hellos/R69QGJB2I9T359F3CLA5HDV9NQUDF87FQQH9F8DKIQUCRAQSPJ1FIF3GVL9QIJ8JDLQA5MS09EBVATKUKVFP8RK5Q8QA0LMRIIUTD70)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/R69QGJB2I9T359F3CLA5HDV9NQUDF87FQQH9F8DKIQUCRAQSPJ1FIF3GVL9QIJ8JDLQA5MS09EBVATKUKVFP8RK5Q8QA0LMRIIUTD70
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/R6OV (from rev 20479, 
gnunet/contrib/hellos/R6OVGTG5M5EKRS0MBLGI5VEOG360RCJS2TCUU7OCTGKN5CSBIGCC7C75IU6J1P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/R6OVGTG5M5EKRS0MBLGI5VEOG360RCJS2TCUU7OCTGKN5CSBIGCC7C75IU6J1P3F4OQC2D21203VECHCKQ95IBUMO6C46SH5MPAO9J8
===================================================================
(Binary files differ)

Copied: gnunet/contrib/hellos/RL7P (from rev 20478, 
gnunet/contrib/hellos/RL7P1AO4M4LOI3JPVER5FJKG6A847K3O86NS4Q07J1721371FO7RB6IFVMNI1NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0)
===================================================================
(Binary files differ)

Deleted: 
gnunet/contrib/hellos/RL7P1AO4M4LOI3JPVER5FJKG6A847K3O86NS4Q07J1721371FO7RB6IFVMNI1NKLFTRCM7O5AGJPQ3UDD8MST8QQHLNOC4GUL6731O0
===================================================================
(Binary files differ)

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-03-13 14:25:18 UTC (rev 20479)
+++ gnunet/po/de.po     2012-03-13 14:45:50 UTC (rev 20480)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-03-13 15:25+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,255 +17,279 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:192
 #, fuzzy
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:382
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:396
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:471
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:527
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:528
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:550
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:552
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:585
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:658
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-arm.c:249
 #, fuzzy, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
 "Sektion `%s' angegeben werden.\n"
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:334
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:337
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:363
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:397
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/arm/gnunet-service-arm.c:527
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:549
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:563
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:671
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:884
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:979
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:984
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:989
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:995
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Dienst gelöscht.\n"
+
+#: src/arm/gnunet-service-arm.c:1030
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
+#: src/arm/gnunet-service-arm.c:1076 src/arm/mockup-service.c:41
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1175
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1177
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1262
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1273
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1287
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -338,191 +362,194 @@
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:124 src/chat/gnunet-chat.c:132
+#: src/chat/gnunet-chat.c:212 src/chat/gnunet-chat.c:251
+#: src/chat/gnunet-chat.c:327 src/chat/gnunet-chat.c:369
+#: src/chat/gnunet-chat.c:398 src/chat/gnunet-chat.c:698
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:143
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "`%s' %s schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:146 src/chat/gnunet-chat.c:149
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "`%s' %s schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:152
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:155
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:158
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:161
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:164
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:169
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:172
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:175
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:216
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, fuzzy, c-format
 msgid "`%s' left the room\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:319 src/chat/gnunet-chat.c:361
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:332 src/chat/gnunet-chat.c:700
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:371
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:386
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:432
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
-#, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
+#: src/chat/gnunet-chat.c:441
+#, c-format
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:458
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:511
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:522
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:526
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:530
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:533
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:535
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:537
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:540
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:543
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:545
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:547
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:549
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:552
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:670
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:686
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:725
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:728
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:740
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -551,19 +578,19 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
 #: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/peerinfo-tool/gnunet-peerinfo.c:717
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
 #: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:836
 msgid "don't resolve host names"
 msgstr ""
 
@@ -601,148 +628,148 @@
 msgstr "# Bytes entschlüsselt"
 
 #: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/hostlist/hostlist-server.c:436
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:625
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:698
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:750
 #, fuzzy
 msgid "# session keys received"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:769
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:807
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:883
+#: src/core/gnunet-service-core_kx.c:887
 #: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:921
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:942
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1030
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1041
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1095
+#: src/core/gnunet-service-core_kx.c:1099
 #: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1129
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1161
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1227
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1368
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1410
+#: src/core/gnunet-service-core_kx.c:1435
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1422
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1471
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1532
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1540
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1550 src/hostlist/hostlist-server.c:561
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:165
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:182
+#: src/core/gnunet-service-core_neighbours.c:344
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:253
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:432
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
@@ -819,9 +846,9 @@
 #: src/datastore/plugin_datastore_mysql.c:1362
 #: src/datastore/plugin_datastore_mysql.c:1376
 #: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/namestore/plugin_namestore_sqlite.c:50 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:516
+#: src/include/gnunet_common.h:523
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -863,7 +890,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:457
 #: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1164,13 +1191,13 @@
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:203
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -1192,7 +1219,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/namestore/plugin_namestore_sqlite.c:864
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1225,7 +1252,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:730
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
 #: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
 msgid "be verbose (print progress information)"
@@ -1279,8 +1306,8 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:560
+#: src/testing/testing.c:2024 src/testing/testing.c:2054
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -1570,38 +1597,38 @@
 msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1280
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1296
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1305
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1314
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1379
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1463
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1495 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1569
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1626,14 +1653,14 @@
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1794 src/vpn/gnunet-service-vpn.c:1957
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1853 src/vpn/gnunet-service-vpn.c:1990
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1740,13 +1767,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1951
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1841
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -1867,76 +1894,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:326
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:335
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:341
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:919
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1376
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1418
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1434
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2086
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2096
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2221 src/fs/fs_api.c:2460
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2250 src/fs/fs_api.c:2269 src/fs/fs_api.c:2753
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2697
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2791
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1946,54 +1973,54 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:314
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:502 src/fs/fs_download.c:514
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:883
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:965
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:991
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1014
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1024
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1033
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1886
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2151,7 +2178,7 @@
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:815
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2161,44 +2188,59 @@
 msgid "Failed to start daemon: %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344 src/fs/fs_unindex.c:552 src/fs/fs_unindex.c:616
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/fs/fs_unindex.c:629
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:663
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2349,7 +2391,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:623
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -2362,7 +2404,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:601
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2411,35 +2453,30 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:159 src/statistics/gnunet-statistics.c:126
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/gnunet-pseudonym.c:249 src/fs/gnunet-pseudonym.c:256
+#: src/fs/gnunet-pseudonym.c:258
 #, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
-#, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:278 src/fs/gnunet-publish.c:677
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:281
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:284
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:287
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2448,40 +2485,40 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:291 src/fs/gnunet-publish.c:696
 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/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:294
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:297
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:300
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:303 src/fs/gnunet-publish.c:715
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:306
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:309
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:317
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2510,116 +2547,116 @@
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:304
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:357
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:432
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:459
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:490
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:502
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:506
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:510
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:517
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:551
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 #, 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/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:564
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:572 src/vpn/gnunet-vpn.c:214
 #, 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/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:582 src/fs/gnunet-publish.c:589
 #: src/transport/gnunet-transport.c:530
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:611
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:644
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:656
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:681
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:684
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:688
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2627,7 +2664,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:692
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2635,7 +2672,7 @@
 "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/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2643,7 +2680,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:704
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2651,36 +2688,36 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:708
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:712
 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/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:718
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:722
 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/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:726
 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/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:741
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3101,11 +3138,6 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
-#, fuzzy
-msgid "Failed to connect to the GNS service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
 #: src/gns/gnunet-gns-lookup.c:210
 msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
@@ -3340,7 +3372,8 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
+#: src/hostlist/hostlist-server.c:184 src/peerinfo-tool/gnunet-peerinfo.c:357
+#: src/peerinfo-tool/gnunet-peerinfo.c:468
 #: src/topology/gnunet-daemon-topology.c:875
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3405,23 +3438,28 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:571
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:580
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:594
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:634
 #, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/hostlist-server.c:682
+#, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
@@ -3439,14 +3477,77 @@
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/namestore/gnunet-service-namestore.c:135
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:146
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:152
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:187
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/namestore/gnunet-service-namestore.c:1680
+#, fuzzy
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#: src/namestore/gnunet-service-namestore.c:1689
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:311 src/namestore/namestore_api.c:349
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:319
 msgid "Namestore failed to add record"
 msgstr ""
 
+#: src/namestore/namestore_api.c:357
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:364
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:397
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
+
+#: src/namestore/namestore_api.c:404
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:411
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/namestore/namestore_api.c:418
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/namestore/namestore_api.c:425
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
 #: src/nat/gnunet-nat-server.c:289
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -3478,11 +3579,11 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1331
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1343
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3502,36 +3603,36 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1397
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:198
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:244
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3539,11 +3640,16 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:326
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:690
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
 #: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
@@ -3573,30 +3679,52 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:571
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:733
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:740
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:839
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -3668,12 +3796,12 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:258
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:317
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
@@ -3703,11 +3831,6 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
 #: src/template/gnunet-template.c:68
 #, fuzzy
 msgid "help text"
@@ -3766,153 +3889,153 @@
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:218 src/testing/testing.c:812
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:241
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:242
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:294
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:301
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:302 src/testing/testing.c:490
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:362
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:366
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:376
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:408
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:482
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:489
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:511 src/testing/testing.c:616
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:512 src/testing/testing.c:617
+#: src/testing/testing.c:637
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:586
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:636
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:657 src/testing/testing.c:689
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:672 src/testing/testing.c:727
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:800
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:970
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1241 src/testing/testing_group.c:6275
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1326 src/testing/testing.c:1401
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1498
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1655
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1663
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1692
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1695
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1850
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1978
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2201
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -3963,7 +4086,7 @@
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3115
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -3972,224 +4095,224 @@
 "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/testing/testing_group.c:3020
+#: src/testing/testing_group.c:3017
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3133
+#: src/testing/testing_group.c:3130
 #, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
+msgid "Copying file with RENAME (%s,%s)\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/testing/testing_group.c:3156
+#: src/testing/testing_group.c:3153
 #, fuzzy, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/testing/testing_group.c:3173
+#: src/testing/testing_group.c:3170
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
+#: src/testing/testing_group.c:3188
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:3203
 #, fuzzy
 msgid "Finished copying all blacklist files!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+#: src/testing/testing_group.c:3583 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4881 src/testing/testing_group.c:5022
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_group.c:3593 src/testing/testing_group.c:4891
+#: src/testing/testing_group.c:5032
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_group.c:3605
 #, fuzzy, c-format
 msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_group.c:3731
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3988
+#: src/testing/testing_group.c:3985
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3993
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3998
+#: src/testing/testing_group.c:3995
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4002
+#: src/testing/testing_group.c:3999
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4006
+#: src/testing/testing_group.c:4003
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4007
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4014
+#: src/testing/testing_group.c:4011
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4015
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4023
+#: src/testing/testing_group.c:4020
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
+#: src/testing/testing_group.c:4024
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4043
+#: src/testing/testing_group.c:4040
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
+#: src/testing/testing_group.c:4055
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4064
+#: src/testing/testing_group.c:4061
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4081
+#: src/testing/testing_group.c:4078
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4087
+#: src/testing/testing_group.c:4084
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4093
+#: src/testing/testing_group.c:4090
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4099
+#: src/testing/testing_group.c:4096
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4111
+#: src/testing/testing_group.c:4108
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4117
+#: src/testing/testing_group.c:4114
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
+#: src/testing/testing_group.c:4149
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
+#: src/testing/testing_group.c:4155
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_group.c:4170
 #, fuzzy
 msgid "Failed during blacklist file copying!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:4179
+#: src/testing/testing_group.c:4176
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5263
+#: src/testing/testing_group.c:5260
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5270
+#: src/testing/testing_group.c:5267
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5277
+#: src/testing/testing_group.c:5274
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5283
+#: src/testing/testing_group.c:5280
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5290
+#: src/testing/testing_group.c:5287
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5294
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5304
+#: src/testing/testing_group.c:5301
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5311
+#: src/testing/testing_group.c:5308
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
+#: src/testing/testing_group.c:5315
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5324
+#: src/testing/testing_group.c:5321
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_group.c:5327
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_group.c:5337
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
+#: src/testing/testing_group.c:5345
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5357
+#: src/testing/testing_group.c:5354
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5367
+#: src/testing/testing_group.c:5364
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
+#: src/testing/testing_group.c:6059 src/transport/transport-testing.c:650
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_group.c:6128
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4763,93 +4886,94 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:525
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:676
+#: src/transport/plugin_transport_tcp.c:765
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:898
+#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:1010
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:682
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:1668
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:769
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:820
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:902
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1193
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1310
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1710
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1863
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:1930
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2081 src/util/service.c:889
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2095
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2157
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2180
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2184
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2188
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4869,22 +4993,22 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:2032
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2127
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1063
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -4904,7 +5028,7 @@
 #: src/transport/plugin_transport_wlan.c:1159
 #: src/transport/plugin_transport_wlan.c:1190
 #: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
+#: src/transport/plugin_transport_wlan.c:3161
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -4946,8 +5070,8 @@
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
+#: src/transport/plugin_transport_wlan.c:2920
+#: src/transport/plugin_transport_wlan.c:3164
 msgid "# wlan mac endpoints"
 msgstr ""
 
@@ -4971,25 +5095,25 @@
 msgid "# wlan acks received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2879
+#: src/transport/plugin_transport_wlan.c:2880
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
+#: src/transport/plugin_transport_wlan.c:2904
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2957
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
+#: src/transport/plugin_transport_wlan.c:3011
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3021
+#: src/transport/plugin_transport_wlan.c:3022
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -5151,7 +5275,7 @@
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1465
+#: src/util/connection.c:1466
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
@@ -5176,43 +5300,43 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -5423,12 +5547,12 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:406 src/util/pseudonym.c:432
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
@@ -5676,7 +5800,7 @@
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "GNUnet Konfiguration"
@@ -5706,76 +5830,76 @@
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1703
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2044
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2408
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2630
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3139
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3171
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5851,23 +5975,39 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:488 src/include/gnunet_common.h:493
+#: src/include/gnunet_common.h:499
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:509
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:530 src/include/gnunet_common.h:537
 #, 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"
 
 #, fuzzy
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Unbekannte Operation `%s'\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "Namespace `%s' hat das Rating %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the GNS service!\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 
@@ -5934,10 +6074,6 @@
 #~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Dienst gelöscht.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
@@ -6369,9 +6505,6 @@
 #~ "Your configuration changes were NOT saved.\n"
 #~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Diese Version von Windows unterstützt keine Dienste.\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-03-13 14:25:18 UTC (rev 20479)
+++ gnunet/po/es.po     2012-03-13 14:45:50 UTC (rev 20480)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-03-13 15:25+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -17,251 +17,275 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:382
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:396
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:471
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:527
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:528
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:550
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:552
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:585
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:658
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "'%s' se esta cerrando.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:334
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:337
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:363
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:397
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#: src/arm/gnunet-service-arm.c:527
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:549
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:563
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:671
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:884
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:979
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:984
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:989
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:995
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Servicio eliminado.\n"
+
+#: src/arm/gnunet-service-arm.c:1030
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
+#: src/arm/gnunet-service-arm.c:1076 src/arm/mockup-service.c:41
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1175
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1177
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1262
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1273
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1287
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -334,191 +358,194 @@
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:124 src/chat/gnunet-chat.c:132
+#: src/chat/gnunet-chat.c:212 src/chat/gnunet-chat.c:251
+#: src/chat/gnunet-chat.c:327 src/chat/gnunet-chat.c:369
+#: src/chat/gnunet-chat.c:398 src/chat/gnunet-chat.c:698
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:143
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:146 src/chat/gnunet-chat.c:149
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:152
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:155
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:158
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:161
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:164
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:169
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:172
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:175
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:216
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:319 src/chat/gnunet-chat.c:361
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:332 src/chat/gnunet-chat.c:700
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Respuesta inválida a '%s' del par '%s'.\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:371
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:386
 #, fuzzy, c-format
 msgid "Users in room `%s': "
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:432
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
-#, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Operación desconocida '%s'\n"
+#: src/chat/gnunet-chat.c:441
+#, c-format
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:458
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:511
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:522
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:526
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:530
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:533
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:535
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:537
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:540
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:543
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:545
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:547
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:549
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:552
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:670
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:686
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:725
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:728
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:740
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -547,19 +574,19 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Yo soy el par '%s'.\n"
 
 #: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/peerinfo-tool/gnunet-peerinfo.c:717
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
 
 #: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:836
 msgid "don't resolve host names"
 msgstr ""
 
@@ -597,148 +624,148 @@
 msgstr "# bytes desencriptados"
 
 #: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/hostlist/hostlist-server.c:436
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:625
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:698
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:750
 #, fuzzy
 msgid "# session keys received"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:769
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:807
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:883
+#: src/core/gnunet-service-core_kx.c:887
 #: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:921
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:942
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# mensajes fragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1030
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1041
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1095
+#: src/core/gnunet-service-core_kx.c:1099
 #: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1129
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1161
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1227
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1368
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1410
+#: src/core/gnunet-service-core_kx.c:1435
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1422
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1471
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1532
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1540
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1550 src/hostlist/hostlist-server.c:561
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:165
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:182
+#: src/core/gnunet-service-core_neighbours.c:344
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:253
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:432
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
@@ -814,9 +841,9 @@
 #: src/datastore/plugin_datastore_mysql.c:1362
 #: src/datastore/plugin_datastore_mysql.c:1376
 #: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/namestore/plugin_namestore_sqlite.c:50 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:516
+#: src/include/gnunet_common.h:523
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -858,7 +885,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:457
 #: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1157,13 +1184,13 @@
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:203
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
@@ -1185,7 +1212,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/namestore/plugin_namestore_sqlite.c:864
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -1218,7 +1245,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:730
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
 #: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
 msgid "be verbose (print progress information)"
@@ -1271,8 +1298,8 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:560
+#: src/testing/testing.c:2024 src/testing/testing.c:2054
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -1561,38 +1588,38 @@
 msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1280
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1296
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1305
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1314
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1379
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1463
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1495 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1569
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1617,14 +1644,14 @@
 msgstr "# bytes desencriptados"
 
 #: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1794 src/vpn/gnunet-service-vpn.c:1957
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1853 src/vpn/gnunet-service-vpn.c:1990
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1731,13 +1758,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1951
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1841
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -1858,76 +1885,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:326
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:335
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:341
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:919
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1376
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1418
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1434
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2086
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2096
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2221 src/fs/fs_api.c:2460
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2250 src/fs/fs_api.c:2269 src/fs/fs_api.c:2753
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2697
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2791
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1937,53 +1964,53 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:314
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:502 src/fs/fs_download.c:514
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:883
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:965
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:991
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1014
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1024
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1033
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1886
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
@@ -2141,7 +2168,7 @@
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:815
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2151,44 +2178,59 @@
 msgid "Failed to start daemon: %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344 src/fs/fs_unindex.c:552 src/fs/fs_unindex.c:616
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tError leyendo el directorio.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "El fichero '%s' tiene la URI: '%s'\n"
+
+#: src/fs/fs_unindex.c:629
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:663
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2339,7 +2381,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:623
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
@@ -2352,7 +2394,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:601
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2400,35 +2442,30 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:159 src/statistics/gnunet-statistics.c:126
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/gnunet-pseudonym.c:249 src/fs/gnunet-pseudonym.c:256
+#: src/fs/gnunet-pseudonym.c:258
 #, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
-#, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:278 src/fs/gnunet-publish.c:677
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:281
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:284
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:287
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2437,38 +2474,38 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:291 src/fs/gnunet-publish.c:696
 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/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:294
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:297
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:300
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:303 src/fs/gnunet-publish.c:715
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:306
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:309
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:317
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2497,116 +2534,116 @@
 msgid "Cleanup after abort complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:304
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:357
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:432
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:459
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:490
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:502
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Cierre completado.\n"
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:506
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:510
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:517
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:551
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 #, 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/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:564
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:572 src/vpn/gnunet-vpn.c:214
 #, 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/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:582 src/fs/gnunet-publish.c:589
 #: src/transport/gnunet-transport.c:530
 #, 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"
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:611
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:644
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:656
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:681
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:684
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:688
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2614,7 +2651,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:692
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2622,7 +2659,7 @@
 "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/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2630,7 +2667,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:704
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2638,36 +2675,36 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:708
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:712
 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/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:718
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:722
 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/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:726
 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/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:741
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3084,11 +3121,6 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
-#, fuzzy
-msgid "Failed to connect to the GNS service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
 #: src/gns/gnunet-gns-lookup.c:210
 msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
@@ -3323,7 +3355,8 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
+#: src/hostlist/hostlist-server.c:184 src/peerinfo-tool/gnunet-peerinfo.c:357
+#: src/peerinfo-tool/gnunet-peerinfo.c:468
 #: src/topology/gnunet-daemon-topology.c:875
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3388,22 +3421,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:571
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:580
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:594
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:634
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "'%s' no esta disponible."
+
+#: src/hostlist/hostlist-server.c:682
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -3423,14 +3461,77 @@
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/namestore/gnunet-service-namestore.c:135
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:146
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:152
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:187
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/namestore/gnunet-service-namestore.c:1680
+#, fuzzy
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/namestore/gnunet-service-namestore.c:1689
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:311 src/namestore/namestore_api.c:349
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:319
 msgid "Namestore failed to add record"
 msgstr ""
 
+#: src/namestore/namestore_api.c:357
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:364
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:397
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
+
+#: src/namestore/namestore_api.c:404
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:411
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/namestore/namestore_api.c:418
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#: src/namestore/namestore_api.c:425
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
 #: src/nat/gnunet-nat-server.c:289
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -3462,11 +3563,11 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1331
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1343
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3486,36 +3587,36 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1397
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:198
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:244
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3523,11 +3624,16 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:326
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:690
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
 #: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
@@ -3557,30 +3663,52 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:571
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:733
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:740
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:839
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Imprime información de los pares de GNUnet."
@@ -3652,12 +3780,12 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:258
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:317
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
@@ -3687,11 +3815,6 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
 #: src/template/gnunet-template.c:68
 #, fuzzy
 msgid "help text"
@@ -3748,145 +3871,145 @@
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:218 src/testing/testing.c:812
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:241
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:242
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:294
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:301
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:302 src/testing/testing.c:490
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:362
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:366
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:376
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:408
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:482
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:489
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:511 src/testing/testing.c:616
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:512 src/testing/testing.c:617
+#: src/testing/testing.c:637
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:586
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:636
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:657 src/testing/testing.c:689
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:672 src/testing/testing.c:727
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:800
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:970
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1241 src/testing/testing_group.c:6275
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1326 src/testing/testing.c:1401
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1498
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1655
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1663
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1692
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1695
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1850
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1978
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2201
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -3937,230 +4060,230 @@
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3115
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
+#: src/testing/testing_group.c:3017
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3133
+#: src/testing/testing_group.c:3130
 #, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
+msgid "Copying file with RENAME (%s,%s)\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/testing/testing_group.c:3156
+#: src/testing/testing_group.c:3153
 #, fuzzy, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/testing/testing_group.c:3173
+#: src/testing/testing_group.c:3170
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
+#: src/testing/testing_group.c:3188
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:3203
 #, fuzzy
 msgid "Finished copying all blacklist files!\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+#: src/testing/testing_group.c:3583 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4881 src/testing/testing_group.c:5022
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_group.c:3593 src/testing/testing_group.c:4891
+#: src/testing/testing_group.c:5032
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_group.c:3605
 #, fuzzy, c-format
 msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_group.c:3731
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3988
+#: src/testing/testing_group.c:3985
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3993
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3998
+#: src/testing/testing_group.c:3995
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4002
+#: src/testing/testing_group.c:3999
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4006
+#: src/testing/testing_group.c:4003
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4007
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4014
+#: src/testing/testing_group.c:4011
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4015
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4023
+#: src/testing/testing_group.c:4020
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
+#: src/testing/testing_group.c:4024
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4043
+#: src/testing/testing_group.c:4040
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
+#: src/testing/testing_group.c:4055
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4064
+#: src/testing/testing_group.c:4061
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4081
+#: src/testing/testing_group.c:4078
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4087
+#: src/testing/testing_group.c:4084
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4093
+#: src/testing/testing_group.c:4090
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4099
+#: src/testing/testing_group.c:4096
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4111
+#: src/testing/testing_group.c:4108
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4117
+#: src/testing/testing_group.c:4114
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
+#: src/testing/testing_group.c:4149
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
+#: src/testing/testing_group.c:4155
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_group.c:4170
 #, fuzzy
 msgid "Failed during blacklist file copying!\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/testing/testing_group.c:4179
+#: src/testing/testing_group.c:4176
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5263
+#: src/testing/testing_group.c:5260
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5270
+#: src/testing/testing_group.c:5267
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5277
+#: src/testing/testing_group.c:5274
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5283
+#: src/testing/testing_group.c:5280
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5290
+#: src/testing/testing_group.c:5287
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5294
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5304
+#: src/testing/testing_group.c:5301
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5311
+#: src/testing/testing_group.c:5308
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
+#: src/testing/testing_group.c:5315
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5324
+#: src/testing/testing_group.c:5321
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_group.c:5327
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_group.c:5337
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
+#: src/testing/testing_group.c:5345
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5357
+#: src/testing/testing_group.c:5354
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5367
+#: src/testing/testing_group.c:5364
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
+#: src/testing/testing_group.c:6059 src/transport/transport-testing.c:650
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_group.c:6128
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -4729,93 +4852,94 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:525
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:676
+#: src/transport/plugin_transport_tcp.c:765
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:898
+#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:1010
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:682
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:1668
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:769
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:820
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:902
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1193
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1310
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1710
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1863
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:1930
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2081 src/util/service.c:889
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2095
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2157
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2180
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2184
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2188
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4835,22 +4959,22 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:2032
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2127
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1063
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -4870,7 +4994,7 @@
 #: src/transport/plugin_transport_wlan.c:1159
 #: src/transport/plugin_transport_wlan.c:1190
 #: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
+#: src/transport/plugin_transport_wlan.c:3161
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -4912,8 +5036,8 @@
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
+#: src/transport/plugin_transport_wlan.c:2920
+#: src/transport/plugin_transport_wlan.c:3164
 msgid "# wlan mac endpoints"
 msgstr ""
 
@@ -4937,25 +5061,25 @@
 msgid "# wlan acks received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2879
+#: src/transport/plugin_transport_wlan.c:2880
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
+#: src/transport/plugin_transport_wlan.c:2904
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2957
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
+#: src/transport/plugin_transport_wlan.c:3011
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3021
+#: src/transport/plugin_transport_wlan.c:3022
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -5118,7 +5242,7 @@
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:1465
+#: src/util/connection.c:1466
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
@@ -5143,43 +5267,43 @@
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
@@ -5387,12 +5511,12 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:406 src/util/pseudonym.c:432
 #, fuzzy
 msgid "no-name"
 msgstr "Mostrar el nombre"
@@ -5642,7 +5766,7 @@
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Configuración de GNUnet"
@@ -5672,76 +5796,76 @@
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1703
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2044
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2408
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2630
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Configuración de GNUnet"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3139
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3171
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5817,23 +5941,39 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:488 src/include/gnunet_common.h:493
+#: src/include/gnunet_common.h:499
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:509
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:530 src/include/gnunet_common.h:537
 #, 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"
 
 #, fuzzy
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Operación desconocida '%s'\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the GNS service!\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Fichero almacenado en '%s'.\n"
 
@@ -5896,10 +6036,6 @@
 #~ msgstr "Imposible guardar el fichero de configuración '%s':"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Servicio eliminado.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
@@ -6326,9 +6462,6 @@
 #~ "Your configuration changes were NOT saved.\n"
 #~ msgstr "Fichero de configuración '%s' creado.\n"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Esta versión de Windows no soporta servicios.\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-03-13 14:25:18 UTC (rev 20479)
+++ gnunet/po/sv.po     2012-03-13 14:45:50 UTC (rev 20480)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-03-13 15:25+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,246 +16,270 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:382
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:396
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:471
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:527
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:528
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:550
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:552
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:585
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:658
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:334
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:337
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:363
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:397
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/arm/gnunet-service-arm.c:527
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:549
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:563
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:671
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:884
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:979
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:984
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:989
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:995
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Tjänst borttagen.\n"
+
+#: src/arm/gnunet-service-arm.c:1030
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
+#: src/arm/gnunet-service-arm.c:1076 src/arm/mockup-service.c:41
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1175
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1177
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1262
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1273
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1287
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -328,193 +352,196 @@
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:124 src/chat/gnunet-chat.c:132
+#: src/chat/gnunet-chat.c:212 src/chat/gnunet-chat.c:251
+#: src/chat/gnunet-chat.c:327 src/chat/gnunet-chat.c:369
+#: src/chat/gnunet-chat.c:398 src/chat/gnunet-chat.c:698
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:143
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:146 src/chat/gnunet-chat.c:149
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
 # drive = hard drive ?
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:152
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
 # drive = hard drive ?
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:155
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:158
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:161
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:164
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:169
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:172
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:175
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:216
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:319 src/chat/gnunet-chat.c:361
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:332 src/chat/gnunet-chat.c:700
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:371
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:386
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:432
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
-#, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
+#: src/chat/gnunet-chat.c:441
+#, c-format
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:458
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:511
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:522
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:526
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:530
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:533
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:535
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:537
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:540
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:543
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:545
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:547
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:549
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:552
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:670
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:686
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:725
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:728
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:740
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -543,19 +570,19 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
 #: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/peerinfo-tool/gnunet-peerinfo.c:717
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
 #: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:836
 msgid "don't resolve host names"
 msgstr ""
 
@@ -592,148 +619,148 @@
 msgstr "# byte dekrypterade"
 
 #: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/hostlist/hostlist-server.c:436
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:625
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:698
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:750
 #, fuzzy
 msgid "# session keys received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:769
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:807
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:883
+#: src/core/gnunet-service-core_kx.c:887
 #: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:921
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:942
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1030
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1041
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1095
+#: src/core/gnunet-service-core_kx.c:1099
 #: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1129
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1161
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1227
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1368
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1410
+#: src/core/gnunet-service-core_kx.c:1435
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1422
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1471
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1532
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1540
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1550 src/hostlist/hostlist-server.c:561
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:165
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:182
+#: src/core/gnunet-service-core_neighbours.c:344
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:253
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:432
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
@@ -809,9 +836,9 @@
 #: src/datastore/plugin_datastore_mysql.c:1362
 #: src/datastore/plugin_datastore_mysql.c:1376
 #: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/namestore/plugin_namestore_sqlite.c:50 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:516
+#: src/include/gnunet_common.h:523
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -853,7 +880,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:457
 #: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1143,13 +1170,13 @@
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:203
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -1170,7 +1197,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/namestore/plugin_namestore_sqlite.c:864
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1202,7 +1229,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:730
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
 #: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
 msgid "be verbose (print progress information)"
@@ -1255,8 +1282,8 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:560
+#: src/testing/testing.c:2024 src/testing/testing.c:2054
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1544,38 +1571,38 @@
 msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1280
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1296
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1305
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1314
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1379
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1463
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1495 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1569
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1600,14 +1627,14 @@
 msgstr "# byte skickade av typen %d"
 
 #: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1794 src/vpn/gnunet-service-vpn.c:1957
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1853 src/vpn/gnunet-service-vpn.c:1990
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1713,13 +1740,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1951
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1841
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -1839,76 +1866,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:326
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:335
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:341
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:919
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1376
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1418
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1434
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2086
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2096
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2221 src/fs/fs_api.c:2460
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2250 src/fs/fs_api.c:2269 src/fs/fs_api.c:2753
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2697
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2791
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1918,53 +1945,53 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:314
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:502 src/fs/fs_download.c:514
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:883
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:965
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:991
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1014
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1024
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1033
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1886
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2117,7 +2144,7 @@
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:815
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2127,44 +2154,59 @@
 msgid "Failed to start daemon: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344 src/fs/fs_unindex.c:552 src/fs/fs_unindex.c:616
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/fs/fs_unindex.c:629
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:663
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2315,7 +2357,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:623
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
@@ -2328,7 +2370,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:601
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2377,70 +2419,65 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:159 src/statistics/gnunet-statistics.c:126
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/gnunet-pseudonym.c:249 src/fs/gnunet-pseudonym.c:256
+#: src/fs/gnunet-pseudonym.c:258
 #, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
-#, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:278 src/fs/gnunet-publish.c:677
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:281
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:284
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:287
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:291 src/fs/gnunet-publish.c:696
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:294
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:297
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:300
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:303 src/fs/gnunet-publish.c:715
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:306
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:309
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:317
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2469,165 +2506,165 @@
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:304
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:357
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:432
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:459
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:490
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:502
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:506
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:510
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:517
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:551
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 #, 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/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:564
 #, 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/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:572 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:582 src/fs/gnunet-publish.c:589
 #: src/transport/gnunet-transport.c:530
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:611
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:644
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:656
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:681
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:684
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:688
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:692
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:704
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:708
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:712
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:718
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:722
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:726
 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/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:741
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3039,11 +3076,6 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
-#, fuzzy
-msgid "Failed to connect to the GNS service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/gns/gnunet-gns-lookup.c:210
 msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
@@ -3275,7 +3307,8 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
+#: src/hostlist/hostlist-server.c:184 src/peerinfo-tool/gnunet-peerinfo.c:357
+#: src/peerinfo-tool/gnunet-peerinfo.c:468
 #: src/topology/gnunet-daemon-topology.c:875
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3335,22 +3368,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:571
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:580
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:594
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:634
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/hostlist/hostlist-server.c:682
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -3369,14 +3407,76 @@
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/namestore/gnunet-service-namestore.c:135
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:146
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:152
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:187
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/namestore/gnunet-service-namestore.c:1680
+#, fuzzy
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/namestore/gnunet-service-namestore.c:1689
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:311 src/namestore/namestore_api.c:349
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:319
 msgid "Namestore failed to add record"
 msgstr ""
 
+#: src/namestore/namestore_api.c:357
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:364
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:397
+msgid "Namestore removed record successfully"
+msgstr ""
+
+#: src/namestore/namestore_api.c:404
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:411
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/namestore/namestore_api.c:418
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/namestore/namestore_api.c:425
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
 #: src/nat/gnunet-nat-server.c:289
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -3408,11 +3508,11 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1331
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1343
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3432,46 +3532,51 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1397
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:198
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:244
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:326
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:690
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
 #: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
@@ -3501,30 +3606,52 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:571
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:733
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:740
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:839
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3595,12 +3722,12 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:258
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:317
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
@@ -3630,11 +3757,6 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/template/gnunet-template.c:68
 #, fuzzy
 msgid "help text"
@@ -3691,145 +3813,145 @@
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:218 src/testing/testing.c:812
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:241
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:242
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:294
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:301
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:302 src/testing/testing.c:490
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:362
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:366
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:376
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:408
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:482
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:489
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:511 src/testing/testing.c:616
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:512 src/testing/testing.c:617
+#: src/testing/testing.c:637
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:586
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:636
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:657 src/testing/testing.c:689
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:672 src/testing/testing.c:727
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:800
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:970
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1241 src/testing/testing_group.c:6275
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1326 src/testing/testing.c:1401
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1498
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1655
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1663
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1692
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1695
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1850
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1978
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2201
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -3878,230 +4000,230 @@
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3115
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
+#: src/testing/testing_group.c:3017
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3133
+#: src/testing/testing_group.c:3130
 #, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
+msgid "Copying file with RENAME (%s,%s)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/testing/testing_group.c:3156
+#: src/testing/testing_group.c:3153
 #, fuzzy, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/testing/testing_group.c:3173
+#: src/testing/testing_group.c:3170
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
+#: src/testing/testing_group.c:3188
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:3203
 #, fuzzy
 msgid "Finished copying all blacklist files!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+#: src/testing/testing_group.c:3583 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4881 src/testing/testing_group.c:5022
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_group.c:3593 src/testing/testing_group.c:4891
+#: src/testing/testing_group.c:5032
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_group.c:3605
 #, c-format
 msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_group.c:3731
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3988
+#: src/testing/testing_group.c:3985
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3993
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3998
+#: src/testing/testing_group.c:3995
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4002
+#: src/testing/testing_group.c:3999
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4006
+#: src/testing/testing_group.c:4003
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4007
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4014
+#: src/testing/testing_group.c:4011
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4015
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4023
+#: src/testing/testing_group.c:4020
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
+#: src/testing/testing_group.c:4024
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4043
+#: src/testing/testing_group.c:4040
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
+#: src/testing/testing_group.c:4055
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4064
+#: src/testing/testing_group.c:4061
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4081
+#: src/testing/testing_group.c:4078
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4087
+#: src/testing/testing_group.c:4084
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4093
+#: src/testing/testing_group.c:4090
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4099
+#: src/testing/testing_group.c:4096
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4111
+#: src/testing/testing_group.c:4108
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4117
+#: src/testing/testing_group.c:4114
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
+#: src/testing/testing_group.c:4149
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
+#: src/testing/testing_group.c:4155
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_group.c:4170
 #, fuzzy
 msgid "Failed during blacklist file copying!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/testing/testing_group.c:4179
+#: src/testing/testing_group.c:4176
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5263
+#: src/testing/testing_group.c:5260
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5270
+#: src/testing/testing_group.c:5267
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5277
+#: src/testing/testing_group.c:5274
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5283
+#: src/testing/testing_group.c:5280
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5290
+#: src/testing/testing_group.c:5287
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5294
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5304
+#: src/testing/testing_group.c:5301
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5311
+#: src/testing/testing_group.c:5308
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
+#: src/testing/testing_group.c:5315
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5324
+#: src/testing/testing_group.c:5321
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_group.c:5327
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_group.c:5337
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
+#: src/testing/testing_group.c:5345
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5357
+#: src/testing/testing_group.c:5354
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5367
+#: src/testing/testing_group.c:5364
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
+#: src/testing/testing_group.c:6059 src/transport/transport-testing.c:650
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_group.c:6128
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4666,93 +4788,94 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:525
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:676
+#: src/transport/plugin_transport_tcp.c:765
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:898
+#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:1010
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:682
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:1668
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:769
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:820
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:902
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1193
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1310
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1710
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1863
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:1930
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2081 src/util/service.c:889
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2095
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2157
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2180
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2184
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2188
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4772,22 +4895,22 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:2032
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2127
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1063
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -4807,7 +4930,7 @@
 #: src/transport/plugin_transport_wlan.c:1159
 #: src/transport/plugin_transport_wlan.c:1190
 #: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
+#: src/transport/plugin_transport_wlan.c:3161
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -4849,8 +4972,8 @@
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
+#: src/transport/plugin_transport_wlan.c:2920
+#: src/transport/plugin_transport_wlan.c:3164
 msgid "# wlan mac endpoints"
 msgstr ""
 
@@ -4874,25 +4997,25 @@
 msgid "# wlan acks received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2879
+#: src/transport/plugin_transport_wlan.c:2880
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
+#: src/transport/plugin_transport_wlan.c:2904
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2957
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
+#: src/transport/plugin_transport_wlan.c:3011
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:3021
+#: src/transport/plugin_transport_wlan.c:3022
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -5052,7 +5175,7 @@
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/util/connection.c:1465
+#: src/util/connection.c:1466
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
@@ -5076,43 +5199,43 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -5323,12 +5446,12 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:406 src/util/pseudonym.c:432
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
@@ -5577,7 +5700,7 @@
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Nätverksanslutning"
@@ -5607,75 +5730,75 @@
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1703
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2044
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2408
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2630
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3139
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3171
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5751,23 +5874,39 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:488 src/include/gnunet_common.h:493
+#: src/include/gnunet_common.h:499
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:509
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:530 src/include/gnunet_common.h:537
 #, 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"
 
 #, fuzzy
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Okänd operation \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the GNS service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
@@ -5825,10 +5964,6 @@
 #~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Tjänst borttagen.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-03-13 14:25:18 UTC (rev 20479)
+++ gnunet/po/vi.po     2012-03-13 14:45:50 UTC (rev 20480)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-03-13 15:25+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,252 +19,276 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:382
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:396
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:471
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:527
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:528
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:550
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:552
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:585
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:658
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:334
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:337
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:363
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:397
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/arm/gnunet-service-arm.c:527
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:549
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:563
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:671
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:884
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:979
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:984
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:989
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:995
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Dịch vụ đã bị xoá.\n"
+
+#: src/arm/gnunet-service-arm.c:1030
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
+#: src/arm/gnunet-service-arm.c:1076 src/arm/mockup-service.c:41
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1175
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1177
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1262
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1273
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1287
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -337,116 +361,119 @@
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:124 src/chat/gnunet-chat.c:132
+#: src/chat/gnunet-chat.c:212 src/chat/gnunet-chat.c:251
+#: src/chat/gnunet-chat.c:327 src/chat/gnunet-chat.c:369
+#: src/chat/gnunet-chat.c:398 src/chat/gnunet-chat.c:698
 msgid "anonymous"
 msgstr "nặc danh"
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:143
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "« %s » nói: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:146 src/chat/gnunet-chat.c:149
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "« %s » nói cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:152
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "« %s » nói thật: %s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:155
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "« %s » nói thật cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:158
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:161
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:164
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:169
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:172
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "« %s » nói không chính thức: %s\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:175
 #, fuzzy, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:216
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "« %s » vào phòng\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "« %s » rời phòng\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:319 src/chat/gnunet-chat.c:361
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:332 src/chat/gnunet-chat.c:700
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:371
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:386
 #, c-format
 msgid "Users in room `%s': "
 msgstr "Người dùng trong phòng « %s »:"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:432
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
 
-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:441
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Không rõ người dùng « %s »\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:458
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:511
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:522
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
@@ -454,7 +481,7 @@
 "Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
 "cũng gây ra bạn ra khỏi phòng hiện tại)"
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:526
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
@@ -462,77 +489,77 @@
 "Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
 "ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:530
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:533
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:535
 msgid "The `/query' command is an alias for `/msg'"
 msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:537
 #, fuzzy
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:540
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:543
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:545
 #, fuzzy
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:547
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:549
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:552
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 "Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
 "trò chuyện đó"
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:670
 msgid "You must specify a nickname\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:686
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:725
 msgid "set the nickname to use (required)"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:728
 msgid "set the chat room to join"
 msgstr "đặt phòng trò chuyện cần vào"
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:740
 msgid "Join a chat on GNUnet."
 msgstr "Vào phòng trò chuyện trên GNUnet."
 
@@ -561,19 +588,19 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
 #: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/peerinfo-tool/gnunet-peerinfo.c:717
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
 #: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:836
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
@@ -611,148 +638,148 @@
 msgstr "# các byte đã giải mã"
 
 #: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/hostlist/hostlist-server.c:436
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:625
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:698
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:750
 #, fuzzy
 msgid "# session keys received"
 msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:769
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:807
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:883
+#: src/core/gnunet-service-core_kx.c:887
 #: src/transport/gnunet-service-transport_validation.c:803
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:921
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:942
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1030
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1041
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1095
+#: src/core/gnunet-service-core_kx.c:1099
 #: src/transport/gnunet-service-transport_validation.c:1026
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1129
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1161
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1227
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1368
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1410
+#: src/core/gnunet-service-core_kx.c:1435
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1422
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1463
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1471
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1532
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1540
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1550 src/hostlist/hostlist-server.c:561
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #: src/transport/gnunet-service-transport.c:595
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:165
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:182
+#: src/core/gnunet-service-core_neighbours.c:344
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:253
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:432
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
@@ -829,9 +856,9 @@
 #: src/datastore/plugin_datastore_mysql.c:1362
 #: src/datastore/plugin_datastore_mysql.c:1376
 #: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/namestore/plugin_namestore_sqlite.c:50 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:516
+#: src/include/gnunet_common.h:523
 #, 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"
@@ -873,7 +900,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:457
 #: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1174,13 +1201,13 @@
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:203
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -1202,7 +1229,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/namestore/plugin_namestore_sqlite.c:864
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1235,7 +1262,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:730
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
 #: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
 msgid "be verbose (print progress information)"
@@ -1289,8 +1316,8 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:560
+#: src/testing/testing.c:2024 src/testing/testing.c:2054
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1579,38 +1606,38 @@
 msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1280
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1296
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1305
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1314
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1379
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1463
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1495 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1569
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1635,14 +1662,14 @@
 msgstr "# các byte được gửi"
 
 #: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1794 src/vpn/gnunet-service-vpn.c:1957
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1853 src/vpn/gnunet-service-vpn.c:1990
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1749,13 +1776,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1951
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1841
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -1876,76 +1903,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:326
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:335
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:341
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:919
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1376
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1418
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1434
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2086
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2096
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2221 src/fs/fs_api.c:2460
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2250 src/fs/fs_api.c:2269 src/fs/fs_api.c:2753
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2451
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2697
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2791
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1955,53 +1982,53 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:314
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:502 src/fs/fs_download.c:514
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:883
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:965
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:991
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1014
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1024
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1033
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1886
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2152,7 +2179,7 @@
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:815
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2162,44 +2189,59 @@
 msgid "Failed to start daemon: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344 src/fs/fs_unindex.c:552 src/fs/fs_unindex.c:616
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/fs/fs_unindex.c:629
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:663
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2349,7 +2391,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:623
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
@@ -2362,7 +2404,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:601
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2414,35 +2456,30 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:159 src/statistics/gnunet-statistics.c:126
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/gnunet-pseudonym.c:249 src/fs/gnunet-pseudonym.c:256
+#: src/fs/gnunet-pseudonym.c:258
 #, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
-#, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:278 src/fs/gnunet-publish.c:677
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:281
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:284
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:287
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2451,38 +2488,38 @@
 "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/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:291 src/fs/gnunet-publish.c:696
 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/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:294
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:297
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:300
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:303 src/fs/gnunet-publish.c:715
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:306
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:309
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:317
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2511,115 +2548,115 @@
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:304
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:357
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:432
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:459
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:490
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:502
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:506
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:510
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:517
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:551
 #, 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/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 #, 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/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:564
 #, 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/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:572 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:582 src/fs/gnunet-publish.c:589
 #: src/transport/gnunet-transport.c:530
 #, 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"
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:611
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:644
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:656
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:681
 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/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:684
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:688
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2627,7 +2664,7 @@
 "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/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:692
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2635,7 +2672,7 @@
 "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/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2643,7 +2680,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/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:704
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2651,16 +2688,16 @@
 "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/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:708
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:712
 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/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:718
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2668,13 +2705,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:722
 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/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:726
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2682,7 +2719,7 @@
 "Đị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/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:741
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3106,11 +3143,6 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
-#, fuzzy
-msgid "Failed to connect to the GNS service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #: src/gns/gnunet-gns-lookup.c:210
 msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
@@ -3352,7 +3384,8 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
+#: src/hostlist/hostlist-server.c:184 src/peerinfo-tool/gnunet-peerinfo.c:357
+#: src/peerinfo-tool/gnunet-peerinfo.c:468
 #: src/topology/gnunet-daemon-topology.c:875
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3418,23 +3451,28 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:571
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:580
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:594
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:634
 #, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/hostlist/hostlist-server.c:682
+#, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
@@ -3452,14 +3490,78 @@
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/namestore/gnunet-service-namestore.c:135
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:146
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:152
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:187
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/namestore/gnunet-service-namestore.c:1680
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1689
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:311 src/namestore/namestore_api.c:349
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:319
 msgid "Namestore failed to add record"
 msgstr ""
 
+#: src/namestore/namestore_api.c:357
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:364
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:397
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "Dịch vụ GNUnet đã được cài đặt.\n"
+
+#: src/namestore/namestore_api.c:404
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:411
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/namestore/namestore_api.c:418
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/namestore/namestore_api.c:425
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
 #: src/nat/gnunet-nat-server.c:289
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -3491,11 +3593,11 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1331
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1343
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3515,35 +3617,35 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1397
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:198
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:244
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3551,11 +3653,16 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:326
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:690
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
 #: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
@@ -3586,31 +3693,54 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:571
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:733
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:740
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:839
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 #, fuzzy
+msgid "list all known peers"
+msgstr "liệt kê mọi bộ tiếp hợp mạng"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
@@ -3680,12 +3810,12 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:258
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:317
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
@@ -3715,11 +3845,6 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #: src/template/gnunet-template.c:68
 msgid "help text"
 msgstr ""
@@ -3775,145 +3900,145 @@
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:218 src/testing/testing.c:812
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:241
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:242
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:294
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:301
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:302 src/testing/testing.c:490
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:362
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:366
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:376
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:408
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:482
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:489
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:511 src/testing/testing.c:616
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:512 src/testing/testing.c:617
+#: src/testing/testing.c:637
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:586
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:636
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:657 src/testing/testing.c:689
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:672 src/testing/testing.c:727
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:800
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:970
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1241 src/testing/testing_group.c:6275
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1326 src/testing/testing.c:1401
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1498
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1655
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1663
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1692
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1695
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1850
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1978
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2201
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -3964,7 +4089,7 @@
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3115
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -3972,224 +4097,224 @@
 msgstr ""
 "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: src/testing/testing_group.c:3020
+#: src/testing/testing_group.c:3017
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3133
+#: src/testing/testing_group.c:3130
 #, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
+msgid "Copying file with RENAME (%s,%s)\n"
 msgstr "« %s » thất bại với mã lỗi %s: %s\n"
 
-#: src/testing/testing_group.c:3156
+#: src/testing/testing_group.c:3153
 #, fuzzy, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr "« %s » thất bại với mã lỗi %s: %s\n"
 
-#: src/testing/testing_group.c:3173
+#: src/testing/testing_group.c:3170
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
+#: src/testing/testing_group.c:3188
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:3203
 #, fuzzy
 msgid "Finished copying all blacklist files!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+#: src/testing/testing_group.c:3583 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4881 src/testing/testing_group.c:5022
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_group.c:3593 src/testing/testing_group.c:4891
+#: src/testing/testing_group.c:5032
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_group.c:3605
 #, fuzzy, c-format
 msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_group.c:3731
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3988
+#: src/testing/testing_group.c:3985
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3993
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3998
+#: src/testing/testing_group.c:3995
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4002
+#: src/testing/testing_group.c:3999
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4006
+#: src/testing/testing_group.c:4003
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4007
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4014
+#: src/testing/testing_group.c:4011
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4015
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4023
+#: src/testing/testing_group.c:4020
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
+#: src/testing/testing_group.c:4024
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4043
+#: src/testing/testing_group.c:4040
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
+#: src/testing/testing_group.c:4055
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4064
+#: src/testing/testing_group.c:4061
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4081
+#: src/testing/testing_group.c:4078
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4087
+#: src/testing/testing_group.c:4084
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4093
+#: src/testing/testing_group.c:4090
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4099
+#: src/testing/testing_group.c:4096
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4111
+#: src/testing/testing_group.c:4108
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4117
+#: src/testing/testing_group.c:4114
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
+#: src/testing/testing_group.c:4149
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
+#: src/testing/testing_group.c:4155
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_group.c:4170
 #, fuzzy
 msgid "Failed during blacklist file copying!\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/testing/testing_group.c:4179
+#: src/testing/testing_group.c:4176
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5263
+#: src/testing/testing_group.c:5260
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5270
+#: src/testing/testing_group.c:5267
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5277
+#: src/testing/testing_group.c:5274
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5283
+#: src/testing/testing_group.c:5280
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5290
+#: src/testing/testing_group.c:5287
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5294
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5304
+#: src/testing/testing_group.c:5301
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5311
+#: src/testing/testing_group.c:5308
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
+#: src/testing/testing_group.c:5315
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5324
+#: src/testing/testing_group.c:5321
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_group.c:5327
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_group.c:5337
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
+#: src/testing/testing_group.c:5345
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5357
+#: src/testing/testing_group.c:5354
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5367
+#: src/testing/testing_group.c:5364
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
+#: src/testing/testing_group.c:6059 src/transport/transport-testing.c:650
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_group.c:6128
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4763,93 +4888,94 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:525
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:676
+#: src/transport/plugin_transport_tcp.c:765
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:898
+#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:1010
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:682
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:1668
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:769
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:820
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:902
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1193
 #, fuzzy, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1116
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1310
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1710
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1863
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:1930
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2081 src/util/service.c:889
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2095
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2157
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2180
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2184
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2188
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4869,22 +4995,22 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:2032
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2127
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1063
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -4904,7 +5030,7 @@
 #: src/transport/plugin_transport_wlan.c:1159
 #: src/transport/plugin_transport_wlan.c:1190
 #: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
+#: src/transport/plugin_transport_wlan.c:3161
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -4946,8 +5072,8 @@
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
+#: src/transport/plugin_transport_wlan.c:2920
+#: src/transport/plugin_transport_wlan.c:3164
 msgid "# wlan mac endpoints"
 msgstr ""
 
@@ -4971,25 +5097,25 @@
 msgid "# wlan acks received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2879
+#: src/transport/plugin_transport_wlan.c:2880
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
+#: src/transport/plugin_transport_wlan.c:2904
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2957
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
+#: src/transport/plugin_transport_wlan.c:3011
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3021
+#: src/transport/plugin_transport_wlan.c:3022
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -5150,7 +5276,7 @@
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
-#: src/util/connection.c:1465
+#: src/util/connection.c:1466
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
@@ -5174,43 +5300,43 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 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"
@@ -5421,12 +5547,12 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:406 src/util/pseudonym.c:432
 msgid "no-name"
 msgstr "không-tên"
 
@@ -5672,7 +5798,7 @@
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "# các kết nối dht"
@@ -5702,75 +5828,75 @@
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1703
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2044
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2202
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2408
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2630
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3139
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3171
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5846,23 +5972,38 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:488 src/include/gnunet_common.h:493
+#: src/include/gnunet_common.h:499
 #, fuzzy, c-format
 msgid "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.\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:509
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:530 src/include/gnunet_common.h:537
 #, 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 với lỗi: %s\n"
 
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Không rõ người dùng « %s »\n"
+
 #, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the GNS service!\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
@@ -5930,10 +6071,6 @@
 #~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Dịch vụ đã bị xoá.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
@@ -6343,9 +6480,6 @@
 #~ "\n"
 #~ "CHƯA lưu các thay đổi trong cấu hình.\n"
 
-#~ msgid "list all network adapters"
-#~ msgstr "liệt kê mọi bộ tiếp hợp mạng"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "cài đặt GNUnet như là một dịch vụ Windows"
 
@@ -6355,9 +6489,6 @@
 #~ msgid "display a file's hash value"
 #~ msgstr "hiển thị giá trị tổng kiểm của tập tin"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "Dịch vụ GNUnet đã được cài đặt.\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Phiên bản Windows này không hỗ trợ dịch vụ.\n"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-03-13 14:25:18 UTC (rev 20479)
+++ gnunet/po/zh_CN.po  2012-03-13 14:45:50 UTC (rev 20480)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-03-13 15:25+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,245 +16,268 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:382
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:396
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:471
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:527
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:528
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:550
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:552
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:585
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:658
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 msgid "Error communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 msgid "Operation failed.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
+
+#: src/arm/gnunet-arm.c:225
+msgid "Running services:\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:334
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:337
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:363
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:397
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/arm/gnunet-service-arm.c:527
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:549
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:563
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:671
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:884
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:979
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:984
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:989
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:995
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-service-arm.c:1030
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
+#: src/arm/gnunet-service-arm.c:1076 src/arm/mockup-service.c:41
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1175
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1177
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1262
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1273
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1287
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -325,190 +348,193 @@
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:124 src/chat/gnunet-chat.c:132
+#: src/chat/gnunet-chat.c:212 src/chat/gnunet-chat.c:251
+#: src/chat/gnunet-chat.c:327 src/chat/gnunet-chat.c:369
+#: src/chat/gnunet-chat.c:398 src/chat/gnunet-chat.c:698
 msgid "anonymous"
 msgstr "匿名"
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:143
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "“%s”说:%s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:146 src/chat/gnunet-chat.c:149
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:152
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:155
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:158
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:161
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:164
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:169
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:172
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:175
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:216
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "“%s”进入了房间\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:258
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "“%s”离开了房间\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:319 src/chat/gnunet-chat.c:361
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "已将用户名改为“%s”。\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:332 src/chat/gnunet-chat.c:700
 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:371
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "已将用户名改为“%s”。\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:386
 #, c-format
 msgid "Users in room `%s': "
 msgstr "房间“%s”中的用户:"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:432
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "语法:/msg 用户名 消息"
 
-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:441
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s”\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:458
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "用户“%s”当前不在房间里!\n"
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:511
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:522
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:526
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:530
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:533
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:535
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:537
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:540
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:543
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:545
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:547
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:549
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:552
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:670
 msgid "You must specify a nickname\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:686
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:725
 msgid "set the nickname to use (required)"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:728
 msgid "set the chat room to join"
 msgstr "设置要加入的聊天室"
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:740
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -537,19 +563,19 @@
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/peerinfo-tool/gnunet-peerinfo.c:240
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/peerinfo-tool/gnunet-peerinfo.c:717
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
 #: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
+#: src/peerinfo-tool/gnunet-peerinfo.c:836
 msgid "don't resolve host names"
 msgstr ""
 
@@ -584,131 +610,131 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/hostlist/hostlist-server.c:436
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:625
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:698
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:750
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:769
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:807
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:883
+#: src/core/gnunet-service-core_kx.c:887
 #: src/transport/gnunet-service-transport_validation.c:803
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:921
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:942
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1030
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1041
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1095
+#: src/core/gnunet-service-core_kx.c:1099
 #: src/transport/gnunet-service-transport_validation.c:1026
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1129
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1161
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1227
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1368
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1410
+#: src/core/gnunet-service-core_kx.c:1435
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1422
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1459
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1463
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1471
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1532
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1540
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1550 src/hostlist/hostlist-server.c:561
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #: src/transport/gnunet-service-transport.c:595
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:165
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:182
+#: src/core/gnunet-service-core_neighbours.c:344
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:253
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:432
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
@@ -781,9 +807,9 @@
 #: src/datastore/plugin_datastore_mysql.c:1362
 #: src/datastore/plugin_datastore_mysql.c:1376
 #: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/namestore/plugin_namestore_sqlite.c:50 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:516
+#: src/include/gnunet_common.h:523
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -825,7 +851,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:457
 #: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1100,13 +1126,13 @@
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:203
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -1128,7 +1154,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/namestore/plugin_namestore_sqlite.c:864
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1161,7 +1187,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:730
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
 #: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
 msgid "be verbose (print progress information)"
@@ -1214,8 +1240,8 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:560
+#: src/testing/testing.c:2024 src/testing/testing.c:2054
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1483,37 +1509,37 @@
 msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1280
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1296
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1305
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1314
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1379
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1463
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1495 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1569
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1537,14 +1563,14 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1794 src/vpn/gnunet-service-vpn.c:1957
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1853 src/vpn/gnunet-service-vpn.c:1990
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1639,13 +1665,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1951
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1841
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -1756,76 +1782,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:326
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:335
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:341
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:919
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1376
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1418
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1434
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2086
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2096
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2221 src/fs/fs_api.c:2460
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2250 src/fs/fs_api.c:2269 src/fs/fs_api.c:2753
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2451
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2697
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2791
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1834,53 +1860,53 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:314
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:502 src/fs/fs_download.c:514
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:883
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:965
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:991
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1014
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1024
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1033
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1886
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2026,7 +2052,7 @@
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:815
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2036,43 +2062,58 @@
 msgid "Failed to start daemon: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344 src/fs/fs_unindex.c:552 src/fs/fs_unindex.c:616
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/fs_unindex.c:629
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:663
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2221,7 +2262,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:623
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
@@ -2234,7 +2275,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:601
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2282,69 +2323,64 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:159 src/statistics/gnunet-statistics.c:126
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/gnunet-pseudonym.c:165
-#, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:249 src/fs/gnunet-pseudonym.c:256
+#: src/fs/gnunet-pseudonym.c:258
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:278 src/fs/gnunet-publish.c:677
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:281
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:284
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:287
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:291 src/fs/gnunet-publish.c:696
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:294
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:297
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:300
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:303 src/fs/gnunet-publish.c:715
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:306
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:309
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:317
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2372,163 +2408,163 @@
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:304
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:357
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:432
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:459
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:490
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:502
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:506
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:510
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:517
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:551
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:564
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:572 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/fs/gnunet-publish.c:582 src/fs/gnunet-publish.c:589
 #: src/transport/gnunet-transport.c:530
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:611
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:644
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:656
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:681
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:684
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:688
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:692
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:699
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:704
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:708
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:712
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:718
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:722
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:726
 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/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:741
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2914,11 +2950,6 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
-#, fuzzy
-msgid "Failed to connect to the GNS service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/gns/gnunet-gns-lookup.c:210
 msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
@@ -3147,7 +3178,8 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
+#: src/hostlist/hostlist-server.c:184 src/peerinfo-tool/gnunet-peerinfo.c:357
+#: src/peerinfo-tool/gnunet-peerinfo.c:468
 #: src/topology/gnunet-daemon-topology.c:875
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3207,22 +3239,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:571
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:580
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:594
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:634
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/hostlist-server.c:682
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -3241,14 +3278,75 @@
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/namestore/gnunet-service-namestore.c:135
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:146
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:152
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:187
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/namestore/gnunet-service-namestore.c:1680
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1689
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:311 src/namestore/namestore_api.c:349
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:319
 msgid "Namestore failed to add record"
 msgstr ""
 
+#: src/namestore/namestore_api.c:357
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:364
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:397
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "GNUnet 服务安装成功。\n"
+
+#: src/namestore/namestore_api.c:404
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:411
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/namestore/namestore_api.c:418
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/namestore_api.c:425
+msgid "Failed to put new set of records in database"
+msgstr ""
+
 #: src/nat/gnunet-nat-server.c:289
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
@@ -3280,11 +3378,11 @@
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1331
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1343
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3303,45 +3401,50 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1397
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:198
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:244
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:326
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:690
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
 #: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
@@ -3369,31 +3472,54 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:571
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:733
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:740
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:839
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:842
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:845
 #, fuzzy
+msgid "list all known peers"
+msgstr "列出所有网络适配器"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:851
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
@@ -3455,12 +3581,12 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:258
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:317
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
@@ -3490,11 +3616,6 @@
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/template/gnunet-template.c:68
 msgid "help text"
 msgstr ""
@@ -3550,144 +3671,144 @@
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:218 src/testing/testing.c:812
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:241
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:242
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:294
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:301
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:302 src/testing/testing.c:490
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:362
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:366
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:376
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:408
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:482
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:489
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:511 src/testing/testing.c:616
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:512 src/testing/testing.c:617
+#: src/testing/testing.c:637
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:586
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:636
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:657 src/testing/testing.c:689
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:672 src/testing/testing.c:727
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:800
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:970
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1241 src/testing/testing_group.c:6275
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1326 src/testing/testing.c:1401
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1498
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1655
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1663
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1692
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1695
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1850
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1978
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "加载 sqstore 服务失败。检查您的配置!\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2201
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -3736,230 +3857,230 @@
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3115
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
+#: src/testing/testing_group.c:3017
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3133
+#: src/testing/testing_group.c:3130
 #, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
+msgid "Copying file with RENAME (%s,%s)\n"
 msgstr "“%s”以错误码 %s 失败:%s\n"
 
-#: src/testing/testing_group.c:3156
+#: src/testing/testing_group.c:3153
 #, fuzzy, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr "“%s”以错误码 %s 失败:%s\n"
 
-#: src/testing/testing_group.c:3173
+#: src/testing/testing_group.c:3170
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
+#: src/testing/testing_group.c:3188
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:3203
 #, fuzzy
 msgid "Finished copying all blacklist files!\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+#: src/testing/testing_group.c:3583 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4881 src/testing/testing_group.c:5022
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_group.c:3593 src/testing/testing_group.c:4891
+#: src/testing/testing_group.c:5032
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_group.c:3605
 #, c-format
 msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_group.c:3731
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3988
+#: src/testing/testing_group.c:3985
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3993
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3998
+#: src/testing/testing_group.c:3995
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4002
+#: src/testing/testing_group.c:3999
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4006
+#: src/testing/testing_group.c:4003
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4007
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4014
+#: src/testing/testing_group.c:4011
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4015
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4023
+#: src/testing/testing_group.c:4020
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
+#: src/testing/testing_group.c:4024
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4043
+#: src/testing/testing_group.c:4040
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
+#: src/testing/testing_group.c:4055
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4064
+#: src/testing/testing_group.c:4061
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4081
+#: src/testing/testing_group.c:4078
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4087
+#: src/testing/testing_group.c:4084
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4093
+#: src/testing/testing_group.c:4090
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4099
+#: src/testing/testing_group.c:4096
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4111
+#: src/testing/testing_group.c:4108
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4117
+#: src/testing/testing_group.c:4114
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
+#: src/testing/testing_group.c:4149
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
+#: src/testing/testing_group.c:4155
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_group.c:4170
 #, fuzzy
 msgid "Failed during blacklist file copying!\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_group.c:4179
+#: src/testing/testing_group.c:4176
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5263
+#: src/testing/testing_group.c:5260
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5270
+#: src/testing/testing_group.c:5267
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5277
+#: src/testing/testing_group.c:5274
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5283
+#: src/testing/testing_group.c:5280
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5290
+#: src/testing/testing_group.c:5287
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5294
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5304
+#: src/testing/testing_group.c:5301
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5311
+#: src/testing/testing_group.c:5308
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
+#: src/testing/testing_group.c:5315
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5324
+#: src/testing/testing_group.c:5321
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_group.c:5327
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_group.c:5337
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
+#: src/testing/testing_group.c:5345
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5357
+#: src/testing/testing_group.c:5354
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5367
+#: src/testing/testing_group.c:5364
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
+#: src/testing/testing_group.c:6059 src/transport/transport-testing.c:650
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_group.c:6128
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4507,87 +4628,88 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:525
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:676
+#: src/transport/plugin_transport_tcp.c:765
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:898
+#: src/transport/plugin_transport_tcp.c:993
+#: src/transport/plugin_transport_tcp.c:1010
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:682
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:1668
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:769
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:820
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:902
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1193
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
+#: src/transport/plugin_transport_tcp.c:1228
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1310
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1710
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1863
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:1930
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2081 src/util/service.c:889
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2095
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2157
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2180
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2184
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2188
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4605,22 +4727,22 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:2032
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2127
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2171
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1063
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -4638,7 +4760,7 @@
 #: src/transport/plugin_transport_wlan.c:1159
 #: src/transport/plugin_transport_wlan.c:1190
 #: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
+#: src/transport/plugin_transport_wlan.c:3161
 msgid "# wlan pending sessions"
 msgstr ""
 
@@ -4678,8 +4800,8 @@
 msgstr ""
 
 #: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
+#: src/transport/plugin_transport_wlan.c:2920
+#: src/transport/plugin_transport_wlan.c:3164
 msgid "# wlan mac endpoints"
 msgstr ""
 
@@ -4699,23 +4821,23 @@
 msgid "# wlan acks received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2879
+#: src/transport/plugin_transport_wlan.c:2880
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
+#: src/transport/plugin_transport_wlan.c:2904
 msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2956
+#: src/transport/plugin_transport_wlan.c:2957
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
+#: src/transport/plugin_transport_wlan.c:3011
 msgid "# wlan messages for this client received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3021
+#: src/transport/plugin_transport_wlan.c:3022
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
@@ -4873,7 +4995,7 @@
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1465
+#: src/util/connection.c:1466
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
@@ -4897,43 +5019,43 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -5141,12 +5263,12 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:406 src/util/pseudonym.c:432
 msgid "no-name"
 msgstr "无名称"
 
@@ -5391,7 +5513,7 @@
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 msgid "# Active tunnels"
 msgstr ""
 
@@ -5419,70 +5541,70 @@
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1703
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2044
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2202
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2353
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2408
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2630
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3139
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3171
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5556,23 +5678,34 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:488 src/include/gnunet_common.h:493
+#: src/include/gnunet_common.h:499
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:509
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:530 src/include/gnunet_common.h:537
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
 #, fuzzy
+#~ msgid "Failed to connect to the GNS service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败:%s\n"
 
@@ -5902,9 +6035,6 @@
 #~ "\n"
 #~ "您的配置更改没有保存。\n"
 
-#~ msgid "list all network adapters"
-#~ msgstr "列出所有网络适配器"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
@@ -5914,9 +6044,6 @@
 #~ msgid "display a file's hash value"
 #~ msgstr "显示一个文件的散列值"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "GNUnet 服务安装成功。\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "此版本的 Windows 不支持服务。\n"
 
@@ -6127,9 +6254,6 @@
 #~ msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
 #~ msgstr "在 NETWORK 节的配置条目 HOST 中有语法错误:“%s”\n"
 
-#~ msgid "Error connecting to %s:%u. Is the daemon running?\n"
-#~ msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
-
 #~ msgid "Reading result from gnunetd failed, reply invalid!\n"
 #~ msgstr "从 gnunetd 读取结果失败,应答无效!\n"
 

Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c       2012-03-13 14:25:18 UTC 
(rev 20479)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c       2012-03-13 14:45:50 UTC 
(rev 20480)
@@ -177,6 +177,42 @@
 
 
 /**
+ * Try to read the HELLO in the given filename and discard expired addresses.
+ * 
+ * @param fn name of the file
+ * @return HELLO of the file, NULL on error
+ */
+static struct GNUNET_HELLO_Message *
+read_host_file (const char *fn)
+{
+  char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
+  const struct GNUNET_HELLO_Message *hello;
+  struct GNUNET_HELLO_Message *hello_clean;
+  int size;
+  struct GNUNET_TIME_Absolute now;
+
+  if (GNUNET_YES != GNUNET_DISK_file_test (fn))
+    return NULL;
+  size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
+  hello = (const struct GNUNET_HELLO_Message *) buffer;
+  if ((size < sizeof (struct GNUNET_MessageHeader)) ||
+      (size != ntohs ((((const struct GNUNET_MessageHeader *) hello)->size)))
+      || (size != GNUNET_HELLO_size (hello)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("Failed to parse HELLO in file `%s'\n"),
+               fn);
+    return NULL;
+  }
+  now = GNUNET_TIME_absolute_get ();
+  hello_clean =
+    GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired,
+                                   &now);
+  return hello_clean; 
+}
+
+
+/**
  * Add a host to the list.
  *
  * @param identity the identity of the host
@@ -185,11 +221,6 @@
 add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
 {
   struct HostEntry *entry;
-  char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
-  const struct GNUNET_HELLO_Message *hello;
-  struct GNUNET_HELLO_Message *hello_clean;
-  int size;
-  struct GNUNET_TIME_Absolute now;
   char *fn;
 
   entry = GNUNET_CONTAINER_multihashmap_get (hostmap, &identity->hashPubKey);
@@ -199,32 +230,11 @@
                             GNUNET_NO);
   entry = GNUNET_malloc (sizeof (struct HostEntry));
   entry->identity = *identity;
-
+  GNUNET_CONTAINER_multihashmap_put (hostmap, &identity->hashPubKey, entry,
+                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   fn = get_host_filename (identity);
-  if (GNUNET_DISK_file_test (fn) == GNUNET_YES)
-  {
-    size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
-    hello = (const struct GNUNET_HELLO_Message *) buffer;
-    if ((size < sizeof (struct GNUNET_MessageHeader)) ||
-        (size != ntohs ((((const struct GNUNET_MessageHeader *) hello)->size)))
-        || (size != GNUNET_HELLO_size (hello)))
-    {
-      GNUNET_break (0);
-      if (0 != UNLINK (fn))
-        GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
-    }
-    else
-    {
-      now = GNUNET_TIME_absolute_get ();
-      hello_clean =
-          GNUNET_HELLO_iterate_addresses (hello, GNUNET_YES, &discard_expired,
-                                          &now);
-      entry->hello = hello_clean;
-    }
-  }
+  entry->hello = read_host_file (fn);
   GNUNET_free (fn);
-  GNUNET_CONTAINER_multihashmap_put (hostmap, &identity->hashPubKey, entry,
-                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   notify_all (entry);
 }
 
@@ -264,6 +274,8 @@
   unsigned int *matched = cls;
   struct GNUNET_PeerIdentity identity;
   const char *filename;
+  struct HostEntry *entry;
+  struct GNUNET_HELLO_Message *hello;
 
   if (GNUNET_DISK_file_test (fullname) != GNUNET_YES)
     return GNUNET_OK;           /* ignore non-files */
@@ -285,6 +297,21 @@
   if (GNUNET_OK !=
       GNUNET_CRYPTO_hash_from_string (filename, &identity.hashPubKey))
   {
+    if (NULL != (hello = read_host_file (filename)))
+    {
+      entry = GNUNET_malloc (sizeof (struct HostEntry));
+      if (GNUNET_OK ==
+         GNUNET_HELLO_get_id (hello,
+                              &entry->identity))
+      {
+       GNUNET_CONTAINER_multihashmap_put (hostmap, 
&entry->identity.hashPubKey, entry,
+                                          
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+       entry->hello = hello;
+       notify_all (entry);
+       return GNUNET_OK;
+      }
+      GNUNET_free (entry);
+    }
     if (NULL != matched)
       remove_garbage (fullname);
     return GNUNET_OK;




reply via email to

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