33 files changed, 35773 insertions, 35123 deletions

diff --git a/configure.ac b/configure.ac
index ab92e7f22..982a4afe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1230,7 +1230,6 @@ po/Makefile.in
 src/Makefile
 src/lib/Makefile
 src/lib/util/Makefile
-src/lib/util/resolver.conf
 src/lib/block/Makefile
 src/lib/curl/Makefile
 src/lib/gnsrecord/Makefile
@@ -1302,6 +1301,7 @@ src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
 src/service/util/Makefile
+src/service/util/resolver.conf
 src/service/vpn/Makefile
 src/service/vpn/vpn.conf
 src/service/zonemaster/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 0e8d89c71..b3dccbbd1 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -186,8 +186,6 @@ EXTRA_DIST = \
   testbed_configs/testbed_supermuc.conf \
   packages/guix/guix.README \
   web/log.php \
-  ci/docker/docker-entrypoint.sh \
-  ci/docker/Dockerfile \
   ci/buildbot/buildbot-update.sh \
   ci/buildbot/ssh-keys \
   ci/buildbot/ssh-config \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7593ec73d..8e5600890 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -221,6 +221,7 @@ src/plugin/namestore/plugin_namestore_flat.c
 src/plugin/namestore/plugin_namestore_postgres.c
 src/plugin/namestore/plugin_namestore_sqlite.c
 src/plugin/namestore/plugin_rest_namestore.c
+src/plugin/reclaim/pabc_helper.c
 src/plugin/reclaim/plugin_gnsrecord_reclaim.c
 src/plugin/reclaim/plugin_reclaim_attribute_basic.c
 src/plugin/reclaim/plugin_reclaim_credential_jwt.c
@@ -409,7 +410,6 @@ src/service/reclaim/did_helper.c
 src/service/reclaim/did_misc.c
 src/service/reclaim/gnunet-service-reclaim.c
 src/service/reclaim/gnunet-service-reclaim_tickets.c
-src/service/reclaim/pabc_helper.c
 src/service/reclaim/reclaim_api.c
 src/service/reclaim/reclaim_attribute.c
 src/service/reclaim/reclaim_credential.c
diff --git a/po/de.po b/po/de.po
index fda288bfd..84ef556bb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,577 +21,2485 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "`%s': unbekannter Dienst: %s\n"
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/abd/gnunet-abd.c:566
-#, fuzzy
-msgid "Ego does not exist!\n"
-msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, fuzzy, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, fuzzy, c-format
-msgid "ego required\n"
-msgstr "Gültiger Typ ist erforderlich\n"
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-#, fuzzy
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-msgid "The public key of the authority to verify the credential against"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1030
-msgid "The ego/zone name to use"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-#, fuzzy
-msgid "GNUnet abd resolver tool"
-msgstr "GNUnet Netzwerk Topologie tracen."
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is starting"
 msgstr "%s startet"
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 #, fuzzy
 msgid "is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "ARM-Dienst konnte nicht gestartet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Fehler bei der Kommunikation mit ARM. Läuft ARM nicht?\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Laufende Dienste:\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s wurde gestoppt.\n"
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, c-format
 msgid "Starting %s...\n"
 msgstr "%s wird gestartet …\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "%s wird gestoppt …\n"
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr "Alle GNUnet-Dienste stoppen"
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr "Einen bestimmten Dienst starten"
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr "Einen bestimmten Dienst stoppen"
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste starten"
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste stoppen und starten"
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen"
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr "ARM-Aktivitäten überwachen"
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr "Keine Statusmeldungen ausgeben"
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr "Alle derzeit laufenden Dienste auflisten"
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
+
+#: src/cli/cadet/gnunet-cadet.c:685
 #, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:746
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cli/cadet/gnunet-cadet.c:775
+#, fuzzy
+msgid "No action requested\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/cli/cadet/gnunet-cadet.c:800
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:817
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cli/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cli/cadet/gnunet-cadet.c:827
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr "# verbundener Freunde"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:99
+#, fuzzy
+msgid "key received"
+msgstr "# empfangene Ergebnisse"
+
+#: src/cli/core/gnunet-core.c:103
+#, fuzzy
+msgid "connection established"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "# verbundener Freunde"
+
+#: src/cli/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "Unbekannter Fehler"
+
+#: src/cli/core/gnunet-core.c:129
+#, fuzzy, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
+
+#: src/cli/core/gnunet-core.c:157
+#, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Ungültiges Befehlszeilenargument »%s«\n"
+
+#: src/cli/core/gnunet-core.c:163
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/core/gnunet-core.c:196
+msgid "Print information about connected peers."
+msgstr "Informationen über verbundene Knoten ausgeben."
+
+#: src/cli/datastore/gnunet-datastore.c:187
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
+#: src/cli/datastore/gnunet-datastore.c:257
+#, fuzzy, c-format
+msgid "Error queueing datastore GET operation\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/cli/datastore/gnunet-datastore.c:319
 #, c-format
-msgid "Using `%s' instead\n"
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Objekt konnte nicht gespeichert werden: %s, Abbruch\n"
+
+#: src/cli/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:378
+#, fuzzy, c-format
+msgid "Error queueing datastore PUT operation\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/cli/datastore/gnunet-datastore.c:454
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:477
+msgid "Dump all records from the datastore"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:482
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# bytes in der Datenbank"
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:498
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "sqlite Datenspeicher"
+
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
+#: src/cli/dht/gnunet-dht-get.c:167
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
 #, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
+msgid "Failed to connect to DHT service!\n"
+msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
+
+#: src/cli/dht/gnunet-dht-get.c:256
+msgid "Issuing DHT GET with key"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:140
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+msgid "Could not connect to DHT service!\n"
+msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:234
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/cli/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:480
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:491
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:661
+#, fuzzy, c-format
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
+
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:54
+#, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:106
+#, fuzzy, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/cli/fs/gnunet-directory.c:109
+#, fuzzy, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/cli/fs/gnunet-directory.c:146
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+
+#: src/cli/fs/gnunet-directory.c:160
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/arm/gnunet-service-arm.c:951
+#: src/cli/fs/gnunet-directory.c:170
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-service-arm.c:962
+#: src/cli/fs/gnunet-directory.c:201
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/cli/fs/gnunet-download.c:131
 #, fuzzy, c-format
-msgid "Starting service `%s'\n"
+msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1062
+#: src/cli/fs/gnunet-download.c:143
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Unbekannter Fehler"
+
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:177
 #, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
+msgid "Error downloading: %s.\n"
+msgstr "Fehler beim Download: %s\n"
 
-#: src/arm/gnunet-service-arm.c:1093
+#: src/cli/fs/gnunet-download.c:189
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Unexpected status: %d\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:234
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
+
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
+msgstr "Die Datei in DATEINAME schreiben"
+
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
+msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen"
+
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1124
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/cli/fs/gnunet-fs.c:180
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Alle Optionen anzeigen"
+
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/fs/gnunet-publish.c:247
 #, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Error publishing: %s.\n"
+msgstr "Fehler beim Download: %s\n"
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/fs/gnunet-publish.c:255
 #, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Dienst »%s« wird neu gestartet.\n"
+msgid "Publishing `%s' done.\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
+#: src/cli/fs/gnunet-publish.c:259
+#, fuzzy, c-format
+msgid "URI is `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/cli/fs/gnunet-publish.c:280
+#, fuzzy
+msgid "Starting cleanup after abort\n"
+msgstr "`%s' Startvorgang abgeschlossen.\n"
+
+#: src/cli/fs/gnunet-publish.c:287
+#, fuzzy
+msgid "Cleanup after abort completed.\n"
+msgstr "`%s' Startvorgang abgeschlossen.\n"
+
+#: src/cli/fs/gnunet-publish.c:292
+#, fuzzy
+msgid "Cleanup after abort failed.\n"
+msgstr "`%s' Startvorgang abgeschlossen.\n"
+
+#: src/cli/fs/gnunet-publish.c:426
+#, fuzzy, c-format
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "Daten des Moduls `%s' werden aktualisiert\n"
+
+#: src/cli/fs/gnunet-publish.c:428
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "Schlüsselwörter für Datei `%s':\n"
+
+#: src/cli/fs/gnunet-publish.c:583
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "`%s': Kann nicht senden.\n"
+
+#: src/cli/fs/gnunet-publish.c:612
+#, fuzzy
+msgid "Could not start publishing.\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/cli/fs/gnunet-publish.c:645
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/cli/fs/gnunet-publish.c:647
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Binde Konfigurationsdatei `%s' ein\n"
+
+#: src/cli/fs/gnunet-publish.c:653
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
-msgstr "Signal"
+#: src/cli/fs/gnunet-publish.c:659
+#, fuzzy
+msgid "Preprocessing complete.\n"
+msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/arm/gnunet-service-arm.c:1765
-msgid "unknown"
-msgstr "Unbekannt"
+#: src/cli/fs/gnunet-publish.c:665
+#, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:679
+#, fuzzy
+msgid "Error scanning directory.\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/fs/gnunet-publish.c:706
 #, c-format
-msgid "Service `%s' took %s to terminate\n"
-msgstr "Dienst »%s« benötigte %s zum Beenden\n"
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/fs/gnunet-publish.c:738
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:811
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
-msgstr "Dienst »%s« wurde normal beendet, wird jederzeit neu gestartet\n"
+msgid "Cannot extract metadata from a URI!\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/fs/gnunet-publish.c:818
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Sie dürfen nur eine einzige Datei zum Einfügen angeben.\n"
+
+#: src/cli/fs/gnunet-publish.c:824
+#, fuzzy, c-format
+msgid "You must NOT specify an URI and a filename.\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
+#, 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/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
+
+#: src/cli/fs/gnunet-publish.c:907
+msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
+"Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
+"ausgeben, aber keinen Upload durchführen"
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
+"Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
+"obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/fs/gnunet-publish.c:928
+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/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
+"Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
+"verschlüsselter Form in der GNUnet-Datenbank)"
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht "
+"werden soll. (nur für das Einfügen in Namensräume)"
+
+#: src/cli/fs/gnunet-publish.c:953
+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 Namensraum)"
 
-#: src/auction/gnunet-auction-create.c:187
+#: src/cli/fs/gnunet-publish.c:965
 msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
-msgid "public auction outcome"
+#: src/cli/fs/gnunet-publish.c:972
+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 "
+"Namensräume)"
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/fs/gnunet-publish.c:980
+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/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:446
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:535
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "Fehler beim Verlassen der DHT.\n"
+
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:629
+msgid "Could not create keyword URI from arguments.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:662
+#, fuzzy, c-format
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/cli/fs/gnunet-search.c:676
+#, fuzzy
+msgid "Could not start searching.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/cli/fs/gnunet-search.c:702
+#, fuzzy
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
+
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:789
+msgid "Search for files that have been published on GNUnet\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:103
+#, fuzzy, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+"\n"
+"Fehler beim Deindizieren der Datei: %s\n"
+
+#: src/cli/fs/gnunet-unindex.c:109
+#, fuzzy
+msgid "Unindexing done.\n"
+msgstr "Dateien deindizieren."
+
+#: src/cli/fs/gnunet-unindex.c:142
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
+
+#: src/cli/fs/gnunet-unindex.c:162
+#, fuzzy
+msgid "Could not start unindex operation.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "»%s« ist keine gültige IP-Adresse.\n"
+
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:345
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/cli/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
+
+#: src/cli/identity/gnunet-identity.c:225
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:551
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:576
+#, fuzzy
+msgid "reduce output"
+msgstr "Ausführliche Ausgabe"
+
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:597
+msgid "display private keys as well"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:105
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:174
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
+
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cli/namecache/gnunet-namecache.c:187
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:220
+#, fuzzy
+msgid "specifies the public key of the zone to look in"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet Konfiguration"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "GNUnet Konfiguration"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "Dienst »%s« läuft nicht\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Schlüssel »%s« ist gültig\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+msgid "name of the ego controlling the zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Unbekannter Befehl »%s«\n"
+
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Fehler beim Lesen von »%s«: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Ungültiges Format für IP: »%s«\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1302
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1327
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1356
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1370
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1381
+msgid "name"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1410
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1471
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, fuzzy, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2004
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2010
+msgid "set the desired nick name for the zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2015
+msgid "monitor changes in the namestore"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2025
+msgid "Output in recordline format"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2031
+msgid "determine our name for the given KEY"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2056
+msgid "omit private records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "# Freunde in Konfiguration"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:852
+msgid "The EGO to use"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "%s wird gestartet …\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Schlüssel »%s« ist gültig\n"
+
+#: src/cli/revocation/gnunet-revocation.c:150
+#, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "Schlüssel »%s« wurde widerrufen\n"
+
+#: src/cli/revocation/gnunet-revocation.c:154
+msgid "Internal error\n"
+msgstr "Interner Fehler\n"
+
+#: src/cli/revocation/gnunet-revocation.c:180
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:183
+msgid "Revocation failed (!)\n"
+msgstr "Widerruf fehlgeschlagen (!)\n"
+
+#: src/cli/revocation/gnunet-revocation.c:189
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:334
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/cli/revocation/gnunet-revocation.c:350
+#, fuzzy, c-format
+msgid "Error: Key is invalid\n"
+msgstr "Schlüssel »%s« ist gültig\n"
+
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:424
+#, c-format
+msgid "Public key `%s' malformed\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:434
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:464
+msgid "No filename to store revocation certificate given.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:481
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Keine Kommandos angegeben.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:558
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "Anzahl an Durchläufen"
+
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
 msgid "help text"
 msgstr "Hilfetext"
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/statistics/gnunet-statistics.c:577
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/statistics/gnunet-statistics.c:589
 #, fuzzy, c-format
-msgid "Invalid target `%s'\n"
+msgid "Failed to initialize watch routine\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:725
+#, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ungültiges Argument »%s«\n"
+
+#: src/cli/statistics/gnunet-statistics.c:742
+#, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:751
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:783
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
+msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
+
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:192
+msgid "Manipulate GNUnet configuration files"
+msgstr "GNUnet-Konfigurationsdateien bearbeiten"
+
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:95
+#, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "»%s« kann nicht geöffnet werden: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:129
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:178
+#, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr ""
+"\n"
+"Schreiben in »%s« nicht möglich: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:185
+#, c-format
+msgid ""
+"\n"
+"Finished!\n"
+msgstr ""
+"\n"
+"Abgeschlossen!\n"
+
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:304
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/cli/util/gnunet-ecc.c:314
+#, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:334
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:479
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:499
+msgid "Manipulate GNUnet private ECC key files"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:775
+#: src/cli/util/gnunet-qr.c:161
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
+msgstr "URL beginnt nicht mit »%s«\n"
+
+#: src/cli/util/gnunet-qr.c:171
+#, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:182
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:218
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "»%s« kann nicht geöffnet werden: %s\n"
+
+#: src/cli/util/gnunet-qr.c:261
 #, fuzzy
-msgid "No action requested\n"
-msgstr " Verbindung fehlgeschlagen\n"
+msgid "Capturing...\n"
+msgstr "%s wird gestartet …\n"
+
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
+#, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/cadet/gnunet-cadet.c:800
+#: src/cli/util/gnunet-qr.c:546
 #, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "No data found\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:183
+msgid "Use built-in GNUnet stub resolver"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:215
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:313
+msgid "Manipulate GNUnet proof of work files"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:95
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "URL beginnt nicht mit »%s«\n"
+
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:142
+msgid "Error creating tunnel\n"
+msgstr "Fehler beim Anlegen des Tunnels\n"
+
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
+#, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Option »%s« ergibt keinen Sinn mit der Option »%s«.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:202
+#, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:216
+#, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Option »%s« oder »%s« ergibt keinen Sinn mit der Option »%s«.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:239
+#, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "»%s« ist kein gültiger Knoten-Bezeichner.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:258
+#, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "»%s« ist keine gültige IP-Adresse.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
+msgstr "Ziel-IP des Tunnels"
+
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
+msgstr "Name des Dienstes, auf den zugegriffen werden soll"
+
+#: src/cli/vpn/gnunet-vpn.c:334
+msgid "service is offered via TCP"
+msgstr "Dienst wird über TCP angeboten"
+
+#: src/cli/vpn/gnunet-vpn.c:339
+msgid "service is offered via UDP"
+msgstr "Dienst wird über UDP angeboten"
+
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr "Tunnel über VPN einrichten."
+
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
+#, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:566
 #, fuzzy
-msgid "Provide information about a patricular peer"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "Ego does not exist!\n"
+msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/contrib/service/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, fuzzy, c-format
+msgid "ego required\n"
+msgstr "Gültiger Typ ist erforderlich\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:890
+#, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:983
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1011
 #, fuzzy
-msgid "Provide information about all peers"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1025
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1030
+msgid "The ego/zone name to use"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:827
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1098
 #, fuzzy
-msgid "Provide information about all tunnels"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "GNUnet abd resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
+
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
+msgstr ""
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
 msgid ""
 "\n"
@@ -599,7019 +2507,5193 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/contrib/service/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
+#: src/contrib/service/conversation/gnunet-conversation.c:287
 #, fuzzy, c-format
 msgid "Call from `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/contrib/service/conversation/gnunet-conversation.c:356
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Telefon konnte nicht eingerichtet werden (interner Fehler)\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
+#: src/contrib/service/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
+#: src/contrib/service/conversation/gnunet-conversation.c:398
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "»%s« konnte nicht aufgelöst werden\n"
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
+#: src/contrib/service/conversation/gnunet-conversation.c:548
 #, c-format
 msgid "Call recipient missing.\n"
 msgstr "Anzurufender Teilnehmer fehlt.\n"
 
-#: src/conversation/gnunet-conversation.c:607
+#: src/contrib/service/conversation/gnunet-conversation.c:607
 #, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr "Es gibt keinen eingehenden Anruf, der angenommen werden könnte!\n"
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/contrib/service/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 "Es gibt keinen eingehenden Anruf »%s«, der jetzt angenommen werden könnte!\n"
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/contrib/service/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr "Derzeit keine Adresse vorhanden.\n"
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/contrib/service/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/contrib/service/conversation/gnunet-conversation.c:680
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/contrib/service/conversation/gnunet-conversation.c:696
 #, c-format
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/contrib/service/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/contrib/service/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr "Wir rufen `%s' an, deren Telefon sollte jetzt klingeln.\n"
 
-#: src/conversation/gnunet-conversation.c:728
+#: src/contrib/service/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr "Anruf wartet:\n"
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u: »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/contrib/service/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
+#: src/contrib/service/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/contrib/service/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/contrib/service/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/contrib/service/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/contrib/service/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/contrib/service/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/contrib/service/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/contrib/service/conversation/gnunet-conversation.c:958
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/contrib/service/conversation/gnunet-conversation.c:961
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/contrib/service/conversation/gnunet-conversation.c:964
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1124
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1134
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1166
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1193
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "pa_stream_write() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr "gnunet-helper-audio-playback - Signal erhalten, wird abgebrochen\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
 #, fuzzy
 msgid "Connection established.\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "pa_stream_new() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr "pa_stream_connect_playback() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "pa_context_connect() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "opus_encode_float() fehlgeschlagen: %s. Abbruch\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
 #, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "pa_stream_peek() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr "Signal erhalten, wird abgebrochen.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:504
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
 msgid "Stream successfully created.\n"
 msgstr "Datenstrom wurde erfolgreich erzeugt.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:509
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "pa_stream_get_buffer_attr() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr "Datenstromfehler: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "pa_stream_connect_record() fehlgeschlagen: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:703
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
 msgid "ogg_stream_init() failed.\n"
 msgstr "ogg_stream_init() fehlgeschlagen.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
-#: src/conversation/microphone.c:118
+#: src/contrib/service/conversation/microphone.c:118
 msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, c-format
 msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
-#: src/conversation/speaker.c:73
+#: src/contrib/service/conversation/speaker.c:73
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:91
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
 #, fuzzy
-msgid "fresh connection"
-msgstr "# verbundener Freunde"
+msgid "number of peers to start"
+msgstr "Anzahl an Durchläufen"
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
+msgid "timeout for the profiling"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
 #, fuzzy
-msgid "key received"
-msgstr "# empfangene Ergebnisse"
+msgid "number of PeerIDs to request"
+msgstr "Anzahl an Durchläufen"
 
-#: src/core/gnunet-core.c:103
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+msgid "Measure quality and performance of the RPS service."
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
-msgid "connection established"
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
+#, fuzzy
+msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:111
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
 #, fuzzy
-msgid "disconnected"
-msgstr "# verbundener Freunde"
+msgid "number of peers in consensus"
+msgstr "Anzahl an Durchläufen"
 
-#: src/core/gnunet-core.c:120
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
 msgstr ""
 
-#: src/core/gnunet-core.c:124
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
 #, fuzzy
-msgid "unknown state"
-msgstr "Unbekannter Fehler"
+msgid "Could not connect to CADET service\n"
+msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "Anzahl an Durchläufen"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "Anzahl an Durchläufen"
 
-#: src/core/gnunet-core.c:129
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+msgid "number of values"
+msgstr "Anzahl der Werte"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
+msgid "No error (success)."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Unbekannter Anfragestatus"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
+#, fuzzy
+msgid "Ego not found."
+msgstr "Kein Inhalt gefunden"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Unbekannter Anfragestatus"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
+#, fuzzy
+msgid "Zone not found."
+msgstr "Kein Inhalt gefunden"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
+#, fuzzy
+msgid "Record not found."
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
+#, fuzzy
+msgid "No records given."
+msgstr "Kein Knoten angegeben!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
+msgid "Record data invalid."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
+#, fuzzy
+msgid "No label given."
+msgstr "Kein Knoten angegeben!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
+#, fuzzy
+msgid "No results given."
+msgstr "# empfangene Ergebnisse"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
+msgid "Record already exists."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
+msgid "Label invalid or malformed."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
 #, fuzzy, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
-msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
+msgid "Error accessing file `%s': %s\n"
+msgstr ""
+"\n"
+"Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/core/gnunet-core.c:157
+#: src/lib/hello/gnunet-hello.c:310
 #, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:315
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/lib/hello/gnunet-hello.c:339
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/lib/hello/gnunet-hello.c:386
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+
+#: src/lib/hello/gnunet-hello.c:395
+#, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:409
+msgid "Hello file to read"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:418
+#, fuzzy
+msgid "Print information about peers."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/lib/hello/hello.c:1089
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1099
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1109
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
+
+#: src/lib/hello/hello.c:1121
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1139
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/lib/hello/hello.c:1147
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1162
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/lib/sq/sq.c:47
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr ""
+"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr "Dateiende"
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
+msgstr ""
+
+#: src/lib/util/bio.c:312
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
 msgstr "Ungültiges Befehlszeilenargument »%s«\n"
 
-#: src/core/gnunet-core.c:163
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
+
+#: src/lib/util/bio.c:345
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/lib/util/bio.c:350
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr ""
+
+#: src/lib/util/bio.c:363
+#, c-format
+msgid "String `%s' longer than allowed (%u > %lu)"
+msgstr ""
+
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
+msgstr ""
+
+#: src/lib/util/bio.c:773
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr ""
+
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:910
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "FEHLER"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "WARNUNG"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "INFO"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr "Unbekannte Adresse"
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr "Ungültige Adresse"
+
+#: src/lib/util/common_logging.c:1416
+#, 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/lib/util/common_logging.c:1431
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/lib/util/configuration.c:1718
+msgid "Not a valid relative time specification"
+msgstr ""
+
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:148
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:263
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/lib/util/crypto_ecc.c:554
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/lib/util/crypto_ecc.c:677
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#: src/lib/util/crypto_ecc_setup.c:282
 #, fuzzy
-msgid "Failed to connect to CORE service!\n"
+msgid "Could not load peer's private key\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr ""
+"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
+
+#: src/lib/util/crypto_rsa.c:908
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/lib/util/crypto_rsa.c:1208
+#, fuzzy, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#: src/lib/util/disk.c:843
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+
+#: src/lib/util/dnsparser.c:910
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr ""
+
+#: src/lib/util/dnsstub.c:228
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+
+#: src/lib/util/dnsstub.c:371
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)\n"
+msgstr ""
+
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+
+#: src/lib/util/dnsstub.c:509
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr ""
+
+#: src/lib/util/getopt.c:566
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Option »%s« ist mehrdeutig\n"
+
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: Option »--%s« erlaubt kein Argument\n"
+
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: Option »%c%s« erlaubt kein Argument\n"
+
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option »%s« benötigt ein Argument\n"
+
+#: src/lib/util/getopt.c:648
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: unbekannte Option »--%s«\n"
+
+#: src/lib/util/getopt.c:654
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: unbekannte Option »%c%s«\n"
+
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: unerlaubte Option -- %c\n"
+
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
+
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Option benötigt ein Argument -- %c\n"
+
+#: src/lib/util/getopt.c:762
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option »-W %s« ist mehrdeutig\n"
+
+#: src/lib/util/getopt.c:782
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
+
+#: src/lib/util/getopt.c:971
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+
+#: src/lib/util/getopt.c:984
+#, fuzzy, c-format
+msgid "Option `%s' can't be used with other options.\n"
+msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
+
+#: src/lib/util/getopt.c:996
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
+"Optionen zwingend.\n"
+
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:463
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
+
+#: src/lib/util/getopt_helpers.c:571
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
+
+#: src/lib/util/getopt_helpers.c:578
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:632
+#, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
+
+#: src/lib/util/getopt_helpers.c:686
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
+
+#: src/lib/util/getopt_helpers.c:743
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
+
+#: src/lib/util/getopt_helpers.c:750
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:876
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
+
+#: src/lib/util/getopt_helpers.c:954
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/lib/util/helper.c:304
+#, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Fehler beim Lesen von »%s«: %s\n"
+
+#: src/lib/util/helper.c:356
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
+
+#: src/lib/util/helper.c:571
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#: src/lib/util/network.c:163
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/lib/util/network.c:1284
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:416
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:787
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+
+#: src/lib/util/os_installation.c:820
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n"
+
+#: src/lib/util/plugin.c:158
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr ""
+"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
+
+#: src/lib/util/plugin.c:215
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
+
+#: src/lib/util/plugin.c:371
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:243
+#, fuzzy, c-format
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
+msgstr ""
+"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
+
+#: src/lib/util/resolver_api.c:888
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/lib/util/resolver_api.c:901
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:1086
+#, fuzzy
+msgid "Resolver not configured correctly.\n"
+msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
+
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#: src/lib/util/service.c:654
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:838
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
+
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/lib/util/service.c:1401
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+
+#: src/lib/util/service.c:1413
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
+
+#: src/lib/util/service.c:1420
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
+
+#: src/lib/util/service.c:1481
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/lib/util/service.c:1505
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr ""
+
+#: src/lib/util/service.c:1658
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
+
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/lib/util/socks.c:636
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/socks.c:653
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
+
+#: src/lib/util/strings.c:394
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr ""
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n"
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n"
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n"
+
+#: src/lib/util/strings.c:1081
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Ungültige Antwort auf `%s' von `%s'\n"
+
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr "Port außerhalb des Bereichs\n"
+
+#: src/lib/util/strings.c:1283
+#, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ungültiges Format für IP: »%s«\n"
+
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
+
+#: src/lib/util/strings.c:1459
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Ungültiges Format für IP: `%s'\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
+
+#: src/lib/util/strings.c:1551
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Falsches Format `%s' für Netzmaske: %s\n"
+
+#: src/lib/util/strings.c:1582
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Falsches Format `%s' für Netzwerk: %s\n"
+
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/lib/util/time.c:937
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr ""
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr ""
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr ""
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr ""
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr ""
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+#, fuzzy
+msgid "flat plugin running\n"
+msgstr "Sqlite-Datenbank läuft\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
-msgid "provide information about all current connections (continuously)"
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:196
-msgid "Print information about connected peers."
-msgstr "Informationen über verbundene Knoten ausgeben."
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+msgid "Sqlite database running\n"
+msgstr "Sqlite-Datenbank läuft\n"
+
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "Sqlite-Datenbank läuft\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+#, fuzzy
+msgid "SQlite database running\n"
+msgstr "Sqlite-Datenbank läuft\n"
+
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+#, fuzzy
+msgid "OpenID Connect REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+#, fuzzy
+msgid "CONFIG REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/service/arm/gnunet-service-arm.c:391
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:951
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/service/arm/gnunet-service-arm.c:1062
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
+
+#: src/service/arm/gnunet-service-arm.c:1093
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1124
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1272
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/service/arm/gnunet-service-arm.c:1604
+#, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Dienst »%s« wird neu gestartet.\n"
+
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr "Signal"
+
+#: src/service/arm/gnunet-service-arm.c:1765
+msgid "unknown"
+msgstr "Unbekannt"
+
+#: src/service/arm/gnunet-service-arm.c:1771
+#, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "Dienst »%s« benötigte %s zum Beenden\n"
+
+#: src/service/arm/gnunet-service-arm.c:1798
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr "Dienst »%s« wurde normal beendet, wird jederzeit neu gestartet\n"
 
-#: src/core/gnunet-service-core.c:329
+#: src/service/arm/gnunet-service-arm.c:1815
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
+
+#: src/service/core/gnunet-service-core.c:329
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core.c:355
+#: src/service/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/service/core/gnunet-service-core.c:419
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:505
+#: src/service/core/gnunet-service-core.c:505
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:824
+#: src/service/core/gnunet-service-core.c:824
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:926
+#: src/service/core/gnunet-service-core.c:926
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:954
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/core/gnunet-service-core_kx.c:511
+#: src/service/core/gnunet-service-core_kx.c:511
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:569
+#: src/service/core/gnunet-service-core_kx.c:569
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:666
+#: src/service/core/gnunet-service-core_kx.c:666
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:718
+#: src/service/core/gnunet-service-core_kx.c:718
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:774
+#: src/service/core/gnunet-service-core_kx.c:774
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:806
+#: src/service/core/gnunet-service-core_kx.c:806
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:865
+#: src/service/core/gnunet-service-core_kx.c:865
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/service/core/gnunet-service-core_kx.c:880
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/service/core/gnunet-service-core_kx.c:917
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/service/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:962
+#: src/service/core/gnunet-service-core_kx.c:962
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/service/core/gnunet-service-core_kx.c:1072
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1082
+#: src/service/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1134
+#: src/service/core/gnunet-service-core_kx.c:1134
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/service/core/gnunet-service-core_kx.c:1159
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1172
+#: src/service/core/gnunet-service-core_kx.c:1172
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/service/core/gnunet-service-core_kx.c:1229
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/service/core/gnunet-service-core_kx.c:1237
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1246
+#: src/service/core/gnunet-service-core_kx.c:1246
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/service/core/gnunet-service-core_kx.c:1288
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1331
+#: src/service/core/gnunet-service-core_kx.c:1331
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1343
+#: src/service/core/gnunet-service-core_kx.c:1343
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1352
+#: src/service/core/gnunet-service-core_kx.c:1352
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/service/core/gnunet-service-core_kx.c:1521
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/service/core/gnunet-service-core_kx.c:1537
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/service/core/gnunet-service-core_kx.c:1632
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1679
+#: src/service/core/gnunet-service-core_kx.c:1679
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1689
+#: src/service/core/gnunet-service-core_kx.c:1689
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/service/core/gnunet-service-core_sessions.c:285
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:400
+#: src/service/core/gnunet-service-core_sessions.c:400
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/service/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
 #, fuzzy
 msgid "# type maps received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_typemap.c:217
+#: src/service/core/gnunet-service-core_typemap.c:217
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:492
+#: src/service/datacache/plugin_datacache_heap.c:492
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:340
+#: src/service/datastore/datastore_api.c:340
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "# verbundener Freunde"
 
-#: src/datastore/datastore_api.c:462
+#: src/service/datastore/datastore_api.c:462
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "# verbundener Knoten"
 
-#: src/datastore/datastore_api.c:565
+#: src/service/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:595
+#: src/service/datastore/datastore_api.c:595
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/datastore/datastore_api.c:756
+#: src/service/datastore/datastore_api.c:756
 msgid "# status messages received"
 msgstr "# empfangene Statusmeldungen"
 
-#: src/datastore/datastore_api.c:810
+#: src/service/datastore/datastore_api.c:810
 msgid "# Results received"
 msgstr "# empfangene Ergebnisse"
 
-#: src/datastore/datastore_api.c:917
+#: src/service/datastore/datastore_api.c:917
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1007
+#: src/service/datastore/datastore_api.c:1007
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1068
+#: src/service/datastore/datastore_api.c:1068
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1113
+#: src/service/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1171
+#: src/service/datastore/datastore_api.c:1171
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1230
+#: src/service/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1276
+#: src/service/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/service/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr "# ausgeführte GET-Anfragen"
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:257
-#, fuzzy, c-format
-msgid "Error queueing datastore GET operation\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
-#, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/datastore/gnunet-datastore.c:319
-#, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "Objekt konnte nicht gespeichert werden: %s, Abbruch\n"
-
-#: src/datastore/gnunet-datastore.c:331
-#, c-format
-msgid "Inserted %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:378
-#, fuzzy, c-format
-msgid "Error queueing datastore PUT operation\n"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-
-#: src/datastore/gnunet-datastore.c:454
-#, c-format
-msgid "Please choose at least one operation: %s, %s\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:477
-msgid "Dump all records from the datastore"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:482
-#, fuzzy
-msgid "Insert records into the datastore"
-msgstr "# bytes in der Datenbank"
-
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:498
-#, fuzzy
-msgid "Manipulate GNUnet datastore"
-msgstr "sqlite Datenspeicher"
-
-#: src/datastore/gnunet-service-datastore.c:335
+#: src/service/datastore/gnunet-service-datastore.c:335
 msgid "# bytes expired"
 msgstr "# abgelaufene Bytes"
 
-#: src/datastore/gnunet-service-datastore.c:419
+#: src/service/datastore/gnunet-service-datastore.c:419
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:551
+#: src/service/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr "# gefundene Ergebnisse"
 
-#: src/datastore/gnunet-service-datastore.c:593
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:612
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:619
+#: src/service/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:693
+#: src/service/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:743
+#: src/service/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:858
+#: src/service/datastore/gnunet-service-datastore.c:858
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/service/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:899
+#: src/service/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:940
+#: src/service/datastore/gnunet-service-datastore.c:940
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:971
+#: src/service/datastore/gnunet-service-datastore.c:971
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1012
+#: src/service/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Kein Inhalt gefunden"
 
-#: src/datastore/gnunet-service-datastore.c:1019
+#: src/service/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/service/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/service/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/service/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/service/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/service/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/service/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# Kontingent"
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/service/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# Zwischenspeichergröße"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/service/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
-#: src/datastore/plugin_datastore_heap.c:895
+#: src/service/datastore/plugin_datastore_heap.c:895
 msgid "Heap database running\n"
 msgstr "Heap-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
+#: src/service/datastore/plugin_datastore_postgres.c:811
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/service/datastore/plugin_datastore_sqlite.c:87
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:634
+#: src/service/datastore/plugin_datastore_sqlite.c:634
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
+#: src/service/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "Anzahl der Werte"
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
 #, fuzzy
 msgid "error preparing statement\n"
 msgstr "Fehler beim Anlegen des Tunnels\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
 #, fuzzy
 msgid "error stepping\n"
 msgstr "%s wird gestoppt"
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-msgid "Sqlite database running\n"
-msgstr "Sqlite-Datenbank läuft\n"
-
-#: src/datastore/plugin_datastore_template.c:252
+#: src/service/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:167
-#, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, c-format
-msgid "Failed to connect to DHT service!\n"
-msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
-
-#: src/dht/gnunet-dht-get.c:256
-msgid "Issuing DHT GET with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-msgid "use DHT's record route option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:925
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "Anzahl an Durchläufen"
-
-#: src/dht/gnunet_dht_profiler.c:964
+#: src/service/dht/gnunet_dht_profiler.c:964
 msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:976
+#: src/service/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
+#: src/service/dht/gnunet_dht_profiler.c:982
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
+#: src/service/dht/gnunet_dht_profiler.c:988
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
+#: src/service/dht/gnunet_dht_profiler.c:993
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
+#: src/service/dht/gnunet_dht_profiler.c:999
 msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
+#: src/service/dht/gnunet_dht_profiler.c:1005
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
+#: src/service/dht/gnunet_dht_profiler.c:1026
 msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:387
+#: src/service/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:240
+#: src/service/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:246
+#: src/service/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:259
+#: src/service/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:463
+#: src/service/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:617
+#: src/service/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:753
+#: src/service/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:829
+#: src/service/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:951
+#: src/service/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:970
+#: src/service/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:993
+#: src/service/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/service/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1066
+#: src/service/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1125
+#: src/service/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/service/exit/gnunet-daemon-exit.c:968
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1074
+#: src/service/exit/gnunet-daemon-exit.c:1074
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1368
+#: src/service/exit/gnunet-daemon-exit.c:1368
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1504
+#: src/service/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/service/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1658
+#: src/service/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1749
+#: src/service/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1837
+#: src/service/exit/gnunet-daemon-exit.c:1837
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1876
+#: src/service/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2017
+#: src/service/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2287
+#: src/service/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/service/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636
+#: src/service/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:2828
+#: src/service/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2837
+#: src/service/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2913
+#: src/service/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2987
+#: src/service/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3036
+#: src/service/exit/gnunet-daemon-exit.c:3036
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3051
+#: src/service/exit/gnunet-daemon-exit.c:3051
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:3078
+#: src/service/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/service/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/service/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/service/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/service/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/service/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3661
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3832
+#: src/service/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3948
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4114
+#: src/service/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fs/fs_api.c:481
+#: src/service/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/fs/fs_api.c:492
+#: src/service/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/fs_api.c:500
+#: src/service/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1157
+#: src/service/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1708
+#: src/service/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1723
+#: src/service/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2452
+#: src/service/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2463
+#: src/service/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2629
+#: src/service/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2847
+#: src/service/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3108
+#: src/service/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:216
+#: src/service/fs/fs_directory.c:216
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:311
+#: src/service/fs/fs_download.c:311
 #, 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:333
+#: src/service/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:347
+#: src/service/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:961
+#: src/service/fs/fs_download.c:961
 #, 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:1045
+#: src/service/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1067
+#: src/service/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1090
+#: src/service/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1101
+#: src/service/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1111
+#: src/service/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1219
+#: src/service/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1890
+#: src/service/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/fs_getopt.c:237
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:191
+#: src/service/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_misc.c:129
+#: src/service/fs/fs_misc.c:129
 #, fuzzy, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/fs_namespace.c:203
+#: src/service/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:234
+#: src/service/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:331
+#: src/service/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:458
+#: src/service/fs/fs_namespace.c:458
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:732
+#: src/service/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:791
+#: src/service/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n"
 
-#: src/fs/fs_publish.c:837
+#: src/service/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:857
+#: src/service/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "Dateiname zu lang"
 
-#: src/fs/fs_publish.c:889
+#: src/service/fs/fs_publish.c:889
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:915
+#: src/service/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/service/fs/fs_publish.c:1108
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:1116
+#: src/service/fs/fs_publish.c:1116
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1157
+#: src/service/fs/fs_publish.c:1157
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1397
+#: src/service/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Verbindung fehlgeschlagen: %s\n"
 
-#: src/fs/fs_publish.c:1489
+#: src/service/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:213
+#: src/service/fs/fs_publish_ksk.c:213
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish_ublock.c:215
+#: src/service/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_search.c:994
+#: src/service/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/service/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:69
+#: src/service/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:276
+#: src/service/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/fs/fs_unindex.c:327
+#: src/service/fs/fs_unindex.c:327
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_unindex.c:386
+#: src/service/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/fs/fs_unindex.c:447
+#: src/service/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:670
+#: src/service/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:709
+#: src/service/fs/fs_unindex.c:709
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:232
+#: src/service/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:291
+#: src/service/fs/fs_uri.c:291
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:309
+#: src/service/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:316
+#: src/service/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:383
+#: src/service/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:424
+#: src/service/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:441
+#: src/service/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
+#: src/service/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:535
+#: src/service/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/service/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/service/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:562
+#: src/service/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:568
+#: src/service/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/service/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/service/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/service/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:599
+#: src/service/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:613
+#: src/service/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:646
+#: src/service/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/fs/fs_uri.c:666
+#: src/service/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1094
+#: src/service/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:234
-#, fuzzy, c-format
-msgid "Failed to load state: %s\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
-#, fuzzy, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:480
-#, c-format
-msgid "Publishing `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:491
-#, fuzzy, c-format
-msgid "Failed to run `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/fs/gnunet-auto-share.c:661
-#, fuzzy, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
-msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
-
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
-
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-daemon-fsprofiler.c:668
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:106
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/fs/gnunet-directory.c:109
-#, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/fs/gnunet-directory.c:146
-#, fuzzy
-msgid "You must specify a filename to inspect.\n"
-msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
-
-#: src/fs/gnunet-directory.c:160
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/fs/gnunet-directory.c:170
-#, fuzzy, c-format
-msgid "`%s' is not a GNUnet directory\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/fs/gnunet-directory.c:201
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/fs/gnunet-download.c:131
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/fs/gnunet-download.c:143
-#, fuzzy
-msgid "<unknown time>"
-msgstr "Unbekannter Fehler"
-
-#: src/fs/gnunet-download.c:155
-#, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:177
-#, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Fehler beim Download: %s\n"
-
-#: src/fs/gnunet-download.c:189
-#, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
-
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:234
-#, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
-
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
-#, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Datei `%s' hat URI: %s\n"
-
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
-
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
-msgstr "Die Datei in DATEINAME schreiben"
-
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr ""
-
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr ""
-
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
-msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen"
-
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/service/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:218
+#: src/service/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:225
+#: src/service/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:237
+#: src/service/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Alle Optionen anzeigen"
-
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:247
-#, fuzzy, c-format
-msgid "Error publishing: %s.\n"
-msgstr "Fehler beim Download: %s\n"
-
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:259
-#, fuzzy, c-format
-msgid "URI is `%s'.\n"
-msgstr "Ich bin Peer `%s'.\n"
-
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr "Ich bin Peer `%s'.\n"
-
-#: src/fs/gnunet-publish.c:280
-#, fuzzy
-msgid "Starting cleanup after abort\n"
-msgstr "`%s' Startvorgang abgeschlossen.\n"
-
-#: src/fs/gnunet-publish.c:287
-#, fuzzy
-msgid "Cleanup after abort completed.\n"
-msgstr "`%s' Startvorgang abgeschlossen.\n"
-
-#: src/fs/gnunet-publish.c:292
-#, fuzzy
-msgid "Cleanup after abort failed.\n"
-msgstr "`%s' Startvorgang abgeschlossen.\n"
-
-#: src/fs/gnunet-publish.c:426
-#, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "Daten des Moduls `%s' werden aktualisiert\n"
-
-#: src/fs/gnunet-publish.c:428
-#, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "Schlüsselwörter für Datei `%s':\n"
-
-#: src/fs/gnunet-publish.c:583
-#, fuzzy
-msgid "Could not publish\n"
-msgstr "`%s': Kann nicht senden.\n"
-
-#: src/fs/gnunet-publish.c:612
-#, fuzzy
-msgid "Could not start publishing.\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
-msgid "Scanning directory `%s'.\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/fs/gnunet-publish.c:647
-#, fuzzy, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "Binde Konfigurationsdatei `%s' ein\n"
-
-#: src/fs/gnunet-publish.c:653
-#, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:659
-#, fuzzy
-msgid "Preprocessing complete.\n"
-msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
-
-#: src/fs/gnunet-publish.c:665
-#, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:671
-msgid "Meta data extraction has finished.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
-
-#: src/fs/gnunet-publish.c:706
-#, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:738
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:811
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:818
-#, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr "Sie dürfen nur eine einzige Datei zum Einfügen angeben.\n"
-
-#: src/fs/gnunet-publish.c:824
-#, 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:833 src/vpn/gnunet-vpn.c:208
-#, 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:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
-msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
-
-#: src/fs/gnunet-publish.c:907
-msgid "enable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-"Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
-"ausgeben, aber keinen Upload durchführen"
-
-#: src/fs/gnunet-publish.c:921
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
-msgstr ""
-"Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
-"obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
-
-#: src/fs/gnunet-publish.c:928
-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-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-"Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
-"verschlüsselter Form in der GNUnet-Datenbank)"
-
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
-"ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht "
-"werden soll. (nur für das Einfügen in Namensräume)"
-
-#: src/fs/gnunet-publish.c:953
-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 Namensraum)"
-
-#: src/fs/gnunet-publish.c:965
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:972
-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 "
-"Namensräume)"
-
-#: src/fs/gnunet-publish.c:980
-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:998
-msgid "Publish a file or directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-search.c:446
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:535
-#, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Fehler beim Verlassen der DHT.\n"
-
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:602
-#, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:608
-#, c-format
-msgid "An output file is mandatory for silent mode.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:629
-msgid "Could not create keyword URI from arguments.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:662
-#, fuzzy, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#: src/fs/gnunet-search.c:676
-#, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/fs/gnunet-search.c:702
-#, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
-msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
-
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
-msgstr ""
-
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:733
-msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
-msgstr ""
-
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
-msgstr ""
-
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
-msgstr ""
-
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
-msgstr ""
-
-#: src/fs/gnunet-search.c:776
-#, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-msgid "Search for files that have been published on GNUnet\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:423
+#: src/service/fs/gnunet-service-fs.c:423
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:785
+#: src/service/fs/gnunet-service-fs.c:785
 #, fuzzy
 msgid "# client searches received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs.c:825
+#: src/service/fs/gnunet-service-fs.c:825
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/service/fs/gnunet-service-fs.c:995
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1237
+#: src/service/fs/gnunet-service-fs.c:1237
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/fs/gnunet-service-fs_cp.c:539
+#: src/service/fs/gnunet-service-fs_cp.c:539
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:671
+#: src/service/fs/gnunet-service-fs_cp.c:671
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:868
+#: src/service/fs/gnunet-service-fs_cp.c:868
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/service/fs/gnunet-service-fs_cp.c:893
 #, fuzzy
 msgid "# request dropped, priority insufficient"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:903
+#: src/service/fs/gnunet-service-fs_cp.c:903
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1000
+#: src/service/fs/gnunet-service-fs_cp.c:1000
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1058
+#: src/service/fs/gnunet-service-fs_cp.c:1058
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1082
+#: src/service/fs/gnunet-service-fs_cp.c:1082
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1096
+#: src/service/fs/gnunet-service-fs_cp.c:1096
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/service/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1197
+#: src/service/fs/gnunet-service-fs_cp.c:1197
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1541
+#: src/service/fs/gnunet-service-fs_cp.c:1541
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/service/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/service/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:296
+#: src/service/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Datei `%s' konnte nicht dekodiert werden bei %s:%d.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/service/fs/gnunet-service-fs_indexing.c:314
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/service/fs/gnunet-service-fs_indexing.c:328
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:260
+#: src/service/fs/gnunet-service-fs_pe.c:260
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:422
+#: src/service/fs/gnunet-service-fs_pe.c:422
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/service/fs/gnunet-service-fs_pe.c:433
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:462
+#: src/service/fs/gnunet-service-fs_pe.c:462
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:530
+#: src/service/fs/gnunet-service-fs_pe.c:530
 #, fuzzy
 msgid "# requests merged"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:540
+#: src/service/fs/gnunet-service-fs_pe.c:540
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:305
+#: src/service/fs/gnunet-service-fs_pr.c:305
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:795
+#: src/service/fs/gnunet-service-fs_pr.c:795
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:869
+#: src/service/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/service/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1032
+#: src/service/fs/gnunet-service-fs_pr.c:1032
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1073
+#: src/service/fs/gnunet-service-fs_pr.c:1073
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/service/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/service/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1433
+#: src/service/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1488
+#: src/service/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1503
+#: src/service/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1526
+#: src/service/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/service/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/service/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1570
+#: src/service/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1616
+#: src/service/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629
+#: src/service/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/service/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1744
+#: src/service/fs/gnunet-service-fs_pr.c:1744
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_push.c:643
+#: src/service/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:103
-#, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
-msgstr ""
-"\n"
-"Fehler beim Deindizieren der Datei: %s\n"
-
-#: src/fs/gnunet-unindex.c:109
-#, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Dateien deindizieren."
-
-#: src/fs/gnunet-unindex.c:142
-#, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
-
-#: src/fs/gnunet-unindex.c:162
-#, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
-msgstr ""
-
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
 msgid "metadata length"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
+#: src/service/fs/meta_data.c:1073
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr ""
 
-#: src/fs/meta_data.c:1092
+#: src/service/fs/meta_data.c:1092
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/meta_data.c:1124
+#: src/service/fs/meta_data.c:1124
 #, c-format
 msgid "Serialized %ld bytes of metadata"
 msgstr ""
 
-#: src/fs/meta_data.c:1131
+#: src/service/fs/meta_data.c:1131
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Unbekannter Anfragestatus"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Kein Inhalt gefunden"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Unbekannter Anfragestatus"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Kein Inhalt gefunden"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "Kein Knoten angegeben!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "Kein Knoten angegeben!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "# empfangene Ergebnisse"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
-#: src/gns/gns_tld_api.c:292
+#: src/service/gns/gns_tld_api.c:292
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
+#: src/service/gns/gnunet-bcd.c:573
 #, fuzzy, c-format
 msgid "Invalid port number %u\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
 msgid "Unable to set up the daemon\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:660
+#: src/service/gns/gnunet-bcd.c:660
 msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
+#: src/service/gns/gnunet-bcd.c:669
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
+#: src/service/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:377
+#: src/service/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/service/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/service/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/service/gns/gnunet-dns2gns.c:670
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/service/gns/gnunet-dns2gns.c:678
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:839
+#: src/service/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:999
+#: src/service/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1016
+#: src/service/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
+#: src/service/gns/gnunet-gns-benchmark.c:582
 msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
+#: src/service/gns/gnunet-gns-benchmark.c:588
 msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
+#: src/service/gns/gnunet-gns-benchmark.c:593
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
+#: src/service/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
 
-#: src/gns/gnunet-gns-proxy.c:979
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/service/gns/gnunet-gns-proxy.c:2654
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/service/gns/gnunet-gns-proxy.c:2686
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/service/gns/gnunet-gns-proxy.c:2895
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/service/gns/gnunet-gns-proxy.c:3268
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/service/gns/gnunet-gns-proxy.c:3300
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3868
+#: src/service/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3873
+#: src/service/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3877
+#: src/service/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
+#: src/service/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "»%s« ist keine gültige IP-Adresse.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet Netzwerk Topologie tracen."
-
-#: src/gns/gnunet-service-gns.c:518
+#: src/service/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, fuzzy, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:900
+#: src/service/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:213
-#, fuzzy, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:230
-#, fuzzy, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:254
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/gns/plugin_rest_gns.c:450
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
-#, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, fuzzy, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
-#, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
-#, fuzzy, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
-#, fuzzy, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
-#, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/hello/gnunet-hello.c:303
-#, fuzzy, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr ""
-"\n"
-"Fehler beim Deindizieren der Datei: %s\n"
-
-#: src/hello/gnunet-hello.c:310
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:315
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
-#, fuzzy, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
-#: src/hello/gnunet-hello.c:339
-#, fuzzy, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/hello/gnunet-hello.c:386
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
-msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
-
-#: src/hello/gnunet-hello.c:395
-#, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:409
-msgid "Hello file to read"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:418
-#, fuzzy
-msgid "Print information about peers."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/hello/hello.c:1089
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr ""
-
-#: src/hello/hello.c:1099
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr ""
-
-#: src/hello/hello.c:1109
-#, fuzzy
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
-
-#: src/hello/hello.c:1121
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr ""
-
-#: src/hello/hello.c:1139
-#, fuzzy, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/hello/hello.c:1147
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr ""
-
-#: src/hello/hello.c:1162
-#, fuzzy, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/hostlist/gnunet-daemon-hostlist.c:306
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
-#, fuzzy, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-msgid "Expired HELLO encountered (ignored)"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, fuzzy, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
 #, fuzzy
 msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, 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"
 
-#: src/identity/gnunet-identity.c:225
-#, fuzzy, c-format
-msgid "Failed to create ego: %s\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
-msgstr ""
-
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:576
-#, fuzzy
-msgid "reduce output"
-msgstr "Ausführliche Ausgabe"
-
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:597
-msgid "display private keys as well"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
-msgstr ""
-
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/identity/gnunet-service-identity.c:921
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/identity/gnunet-service-identity.c:979
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/identity/gnunet-service-identity.c:988
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:1245
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namecache/gnunet-namecache.c:105
-#, fuzzy, c-format
-msgid "No records found for `%s'"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:174
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
-
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namecache/gnunet-namecache.c:187
-#, fuzzy, c-format
-msgid "You must specify a name\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
-
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:220
-#, fuzzy
-msgid "specifies the public key of the zone to look in"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet Konfiguration"
-
-#: src/namecache/namecache_api.c:283
+#: src/service/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:371
+#: src/service/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/namecache/plugin_namecache_flat.c:404
-#, fuzzy
-msgid "flat plugin running\n"
-msgstr "Sqlite-Datenbank läuft\n"
-
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "GNUnet Konfiguration"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
 #, fuzzy
 msgid "no errors"
 msgstr "Unbekannter Fehler"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
 #, fuzzy
 msgid "unable to store record"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
 #, fuzzy
 msgid "invalid name"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
 #, fuzzy
 msgid "No expiration specified for records.\n"
 msgstr "Keine Kommandos angegeben.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
 msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "Dienst »%s« läuft nicht\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Datei `%s' hat URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Datei `%s' hat URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Schlüssel »%s« ist gültig\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Unbekannter Befehl »%s«\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Fehler beim Lesen von »%s«: %s\n"
-
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Ungültiges Format für IP: »%s«\n"
-
-#: src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1381
-msgid "name"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1410
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1461
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-
-#: src/namestore/gnunet-namestore.c:1471
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1491
-#, fuzzy, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
-
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, fuzzy, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1642
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1679
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1967
-#, fuzzy, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2010
-msgid "set the desired nick name for the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2015
-msgid "monitor changes in the namestore"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2025
-msgid "Output in recordline format"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2031
-msgid "determine our name for the given KEY"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2056
-msgid "omit private records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:792
-#, fuzzy
-msgid "Flat file database running\n"
-msgstr "Sqlite-Datenbank läuft\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:956
-#, fuzzy
-msgid "SQlite database running\n"
-msgstr "Sqlite-Datenbank läuft\n"
-
-#: src/namestore/plugin_rest_namestore.c:1320
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:189
-#, fuzzy
-msgid "Suggested configuration changes:\n"
-msgstr ""
-"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, fuzzy, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:327
-#, fuzzy
-msgid "run autoconfiguration"
-msgstr "# Freunde in Konfiguration"
-
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "write configuration file (for autoconfiguration)"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:355
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
+#: src/service/nat-auto/nat_auto_api.c:73
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/service/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
+#: src/service/nat-auto/nat_auto_api.c:79
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/service/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
+#: src/service/nat-auto/nat_auto_api.c:85
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/service/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat-auto/nat_auto_api.c:91
+#: src/service/nat-auto/nat_auto_api.c:91
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/service/nat-auto/nat_auto_api.c:94
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:97
+#: src/service/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/service/nat-auto/nat_auto_api.c:100
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:103
+#: src/service/nat-auto/nat_auto_api.c:103
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/service/nat-auto/nat_auto_api.c:106
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat-auto/nat_auto_api.c:109
+#: src/service/nat-auto/nat_auto_api.c:109
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
+#: src/service/nat-auto/nat_auto_api.c:113
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/nat-auto/nat_auto_api.c:116
+#: src/service/nat-auto/nat_auto_api.c:116
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:119
+#: src/service/nat-auto/nat_auto_api.c:119
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
+#: src/service/nat-auto/nat_auto_api.c:122
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
+#: src/service/nat-auto/nat_auto_api.c:125
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
+#: src/service/nat-auto/nat_auto_api.c:128
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/nat-auto/nat_auto_api_test.c:489
+#: src/service/nat-auto/nat_auto_api_test.c:489
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:464
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr ""
-
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/nat/gnunet-service-nat.c:1362
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1861
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1935
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/gnunet-service-nat_mini.c:188
+#: src/service/nat/gnunet-service-nat_mini.c:188
 #, fuzzy
 msgid "`external-ip' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/gnunet-service-nat_mini.c:602
+#: src/service/nat/gnunet-service-nat_mini.c:602
 #, fuzzy
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/service/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864
+#: src/service/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:879
+#: src/service/nse/gnunet-nse-profiler.c:879
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:888
+#: src/service/nse/gnunet-nse-profiler.c:888
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/service/nse/gnunet-nse-profiler.c:900
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:912
+#: src/service/nse/gnunet-nse-profiler.c:912
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/service/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:657
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:688
+#: src/service/peerstore/gnunet-service-peerstore.c:692
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:781
+#: src/service/peerstore/peerstore_api.c:781
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/peerstore/peerstore_api.c:895
+#: src/service/peerstore/peerstore_api.c:895
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/pt/gnunet-daemon-pt.c:416
+#: src/service/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:422
+#: src/service/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:476
+#: src/service/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:671
+#: src/service/pt/gnunet-daemon-pt.c:671
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:678
+#: src/service/pt/gnunet-daemon-pt.c:678
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/service/pt/gnunet-daemon-pt.c:716
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:771
+#: src/service/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/pt/gnunet-daemon-pt.c:777
+#: src/service/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:786
+#: src/service/pt/gnunet-daemon-pt.c:786
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/service/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/pt/gnunet-daemon-pt.c:898
+#: src/service/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 "Es konnte keine Verbindung mit dem %s-Dienst hergestellt werden. Abbruch\n"
 
-#: src/pt/gnunet-daemon-pt.c:1314
+#: src/service/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:805
-#, fuzzy, c-format
-msgid "Ego is required\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/reclaim/gnunet-reclaim.c:812
-#, c-format
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:819
-#, fuzzy, c-format
-msgid "Requesting party key is required!\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:852
-msgid "The EGO to use"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
-msgstr ""
-
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-#, fuzzy
-msgid "OpenID Connect REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/reclaim/reclaim_api.c:544
+#: src/service/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1365
+#: src/service/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n"
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1421
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Keine Dateien in »%s« gefunden\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/service/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1450
+#: src/service/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1539
+#: src/service/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1546
+#: src/service/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1552
+#: src/service/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
+#: src/service/regex/gnunet-regex-profiler.c:1559
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1566
+#: src/service/regex/gnunet-regex-profiler.c:1566
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1581
+#: src/service/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:151
+#: src/service/regex/regex_api_announce.c:151
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/regex/regex_api_search.c:200
+#: src/service/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/rest/gnunet-rest-server.c:1369
+#: src/service/rest/gnunet-rest-server.c:1369
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/rest/plugin_rest_config.c:428
-#, fuzzy
-msgid "CONFIG REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/rest/plugin_rest_copying.c:211
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "%s wird gestartet …\n"
-
-#: src/revocation/gnunet-revocation.c:146
-#, c-format
-msgid "Key `%s' is valid\n"
-msgstr "Schlüssel »%s« ist gültig\n"
-
-#: src/revocation/gnunet-revocation.c:150
-#, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr "Schlüssel »%s« wurde widerrufen\n"
-
-#: src/revocation/gnunet-revocation.c:154
-msgid "Internal error\n"
-msgstr "Interner Fehler\n"
-
-#: src/revocation/gnunet-revocation.c:180
-#, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:183
-msgid "Revocation failed (!)\n"
-msgstr "Widerruf fehlgeschlagen (!)\n"
-
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:334
-#, fuzzy, c-format
-msgid "Ego `%s' not found.\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/revocation/gnunet-revocation.c:350
-#, fuzzy, c-format
-msgid "Error: Key is invalid\n"
-msgstr "Schlüssel »%s« ist gültig\n"
-
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:424
-#, c-format
-msgid "Public key `%s' malformed\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:464
-msgid "No filename to store revocation certificate given.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:481
-#, fuzzy, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/revocation/gnunet-revocation.c:511
-#, fuzzy
-msgid "No action specified. Nothing to do.\n"
-msgstr "Keine Kommandos angegeben.\n"
-
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:558
-#, fuzzy
-msgid "number of epochs to calculate for"
-msgstr "Anzahl an Durchläufen"
-
-#: src/revocation/gnunet-service-revocation.c:539
+#: src/service/revocation/gnunet-service-revocation.c:539
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:549
+#: src/service/revocation/gnunet-service-revocation.c:549
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
+#: src/service/revocation/gnunet-service-revocation.c:558
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/revocation/gnunet-service-revocation.c:566
+#: src/service/revocation/gnunet-service-revocation.c:566
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:604
+#: src/service/revocation/gnunet-service-revocation.c:604
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
+#: src/service/revocation/gnunet-service-revocation.c:959
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3148
-msgid "timeout for the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3153
-#, fuzzy
-msgid "number of PeerIDs to request"
-msgstr "Anzahl an Durchläufen"
-
-#: src/rps/gnunet-rps-profiler.c:3170
-msgid "Measure quality and performance of the RPS service."
-msgstr ""
-
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-#, fuzzy
-msgid "You must specify at least one message ID to check!\n"
-msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, c-format
-msgid "Malformed input, could not parse `%s'\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-#, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-#, fuzzy
-msgid "number of peers in consensus"
-msgstr "Anzahl an Durchläufen"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "Anzahl an Durchläufen"
-
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "Anzahl an Durchläufen"
-
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-msgid "number of values"
-msgstr "Anzahl der Werte"
-
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-msgid "write statistics to file"
-msgstr ""
-
-#: src/seti/gnunet-seti-profiler.c:457
+#: src/service/seti/gnunet-seti-profiler.c:457
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
-msgstr ""
-
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
-msgstr ""
-
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr ""
-"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, fuzzy, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:577
-#, c-format
-msgid "No subsystem or name given\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:589
-#, fuzzy, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
-#: src/statistics/gnunet-statistics.c:725
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ungültiges Argument »%s«\n"
-
-#: src/statistics/gnunet-statistics.c:742
-#, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:751
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:783
-#, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
-msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
-
-#: src/statistics/statistics_api.c:749
+#: src/service/statistics/statistics_api.c:749
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/testing/gnunet-testing.c:185
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:386
+#: src/service/testing/gnunet-testing.c:386
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:392
+#: src/service/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:400
+#: src/service/testing/gnunet-testing.c:400
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:407
+#: src/service/testing/gnunet-testing.c:407
 msgid "configuration template"
 msgstr "Konfigurationsvorlage"
 
-#: src/testing/gnunet-testing.c:415
+#: src/service/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
+#: src/service/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr ""
-
-#: src/testing/list-keys.c:92
+#: src/service/testing/list-keys.c:92
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/testing.c:291
+#: src/service/testing/testing.c:291
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:743
+#: src/service/testing/testing.c:743
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1217
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1226
+#: src/service/testing/testing.c:1226
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1236
+#: src/service/testing/testing.c:1236
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1249
+#: src/service/testing/testing.c:1249
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing.c:1265
+#: src/service/testing/testing.c:1265
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/testing/testing.c:1279
+#: src/service/testing/testing.c:1279
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/testing/testing.c:1307
+#: src/service/testing/testing.c:1307
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:1413
+#: src/service/testing/testing.c:1413
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "»%s« konnte nicht gestartet werden: %s\n"
 
-#: src/testing/testing.c:1664
+#: src/service/testing/testing.c:1664
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/testing/testing.c:2795
+#: src/service/testing/testing.c:2795
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testing/testing.c:2803
+#: src/service/testing/testing.c:2803
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testing/testing.c:2811
+#: src/service/testing/testing.c:2811
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:257
+#: src/service/topology/gnunet-daemon-topology.c:257
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/topology/gnunet-daemon-topology.c:451
+#: src/service/topology/gnunet-daemon-topology.c:451
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:805
+#: src/service/topology/gnunet-daemon-topology.c:805
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:870
+#: src/service/topology/gnunet-daemon-topology.c:870
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/service/topology/gnunet-daemon-topology.c:1005
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1787
+#: src/service/transport/gnunet-communicator-quic.c:1787
 msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
+#: src/service/transport/gnunet-communicator-tcp.c:4071
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
+#: src/service/transport/gnunet-communicator-udp.c:3433
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
+#: src/service/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1015
+#: src/service/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/gnunet-communicator-unix.c:1138
+#: src/service/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/transport/gnunet-transport.c:415
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/transport/gnunet-transport.c:454
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:477
+#: src/service/transport/gnunet-transport.c:477
 #, fuzzy
 msgid "Failed to list connections, timeout occurred\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/transport/gnunet-transport.c:504
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:537
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/transport/gnunet-transport.c:566
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/transport/gnunet-transport.c:592
+#: src/service/transport/gnunet-transport.c:592
 msgid "Connected to"
 msgstr "Verbunden mit"
 
-#: src/transport/gnunet-transport.c:621
+#: src/service/transport/gnunet-transport.c:621
 msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/transport/gnunet-transport.c:654
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/transport/gnunet-transport.c:701
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1103
+#: src/service/transport/gnunet-transport.c:1103
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/transport/gnunet-transport.c:1199
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/transport/gnunet-transport.c:1214
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1242
+#: src/service/transport/gnunet-transport.c:1242
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1248
+#: src/service/transport/gnunet-transport.c:1248
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1301
+#: src/service/transport/gnunet-transport.c:1301
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1367
+#: src/service/transport/gnunet-transport.c:1367
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1373
+#: src/service/transport/gnunet-transport.c:1373
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/service/transport/gnunet-transport.c:1377
 msgid "disconnect from a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
-#: src/transport/gnunet-transport.c:1383
+#: src/service/transport/gnunet-transport.c:1383
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/transport/gnunet-transport.c:1395
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1399
+#: src/service/transport/gnunet-transport.c:1399
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:1404
+#: src/service/transport/gnunet-transport.c:1404
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1408
+#: src/service/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
+#: src/service/transport/gnunet-transport.c:1414
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
+#: src/service/transport/gnunet-transport.c:1426
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/transport/transport_api2_communication.c:761
+#: src/service/transport/transport_api2_communication.c:761
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr "Dateiende"
-
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
-
-#: src/util/bio.c:312
-#, fuzzy, c-format
-msgid "Invalid handle type while reading `%s'"
-msgstr "Ungültiges Befehlszeilenargument »%s«\n"
-
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
-msgstr ""
-
-#: src/util/bio.c:345
-#, fuzzy, c-format
-msgid "%s (while reading `%s')"
-msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
-#: src/util/bio.c:350
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr ""
-
-#: src/util/bio.c:363
-#, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
-msgstr ""
-
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
-
-#: src/util/bio.c:773
-#, fuzzy, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
-msgstr ""
-
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:910
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr ""
-
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "FEHLER"
-
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "WARNUNG"
-
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
-msgstr ""
-
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr ""
-
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr "Unbekannte Adresse"
-
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr "Ungültige Adresse"
-
-#: src/util/common_logging.c:1416
-#, 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/util/common_logging.c:1431
-#, fuzzy, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/util/configuration.c:1718
-msgid "Not a valid relative time specification"
-msgstr ""
-
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:148
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:263
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:554
-#, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
-#: src/util/crypto_ecc.c:677
-#, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
-#: src/util/crypto_ecc_setup.c:282
-#, fuzzy
-msgid "Could not load peer's private key\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr ""
-"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
-
-#: src/util/crypto_rsa.c:908
-#, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
-#: src/util/crypto_rsa.c:1208
-#, fuzzy, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
-#: src/util/disk.c:843
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
-
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
-
-#: src/util/dnsparser.c:910
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr ""
-
-#: src/util/dnsstub.c:228
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
-
-#: src/util/dnsstub.c:371
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
-msgstr ""
-
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
-
-#: src/util/dnsstub.c:509
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr ""
-
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option »%s« ist mehrdeutig\n"
-
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: Option »--%s« erlaubt kein Argument\n"
-
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: Option »%c%s« erlaubt kein Argument\n"
-
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option »%s« benötigt ein Argument\n"
-
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unbekannte Option »--%s«\n"
-
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unbekannte Option »%c%s«\n"
-
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unerlaubte Option -- %c\n"
-
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
-
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option benötigt ein Argument -- %c\n"
-
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option »-W %s« ist mehrdeutig\n"
-
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
-
-#: src/util/getopt.c:971
-#, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
-
-#: src/util/getopt.c:984
-#, fuzzy, c-format
-msgid "Option `%s' can't be used with other options.\n"
-msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
-
-#: src/util/getopt.c:996
-#, fuzzy, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr "Unbekannte Operation `%s'\n"
-
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
-msgstr ""
-
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
-"Optionen zwingend.\n"
-
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
-msgstr ""
-
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
-msgstr ""
-
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
-
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:463
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr ""
-"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
-
-#: src/util/getopt_helpers.c:571
-#, fuzzy, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
-msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
-
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
-msgstr ""
-
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
-msgstr ""
-
-#: src/util/getopt_helpers.c:632
-#, c-format
-msgid "You must pass relative time to the `%s' option.\n"
-msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
-
-#: src/util/getopt_helpers.c:686
-#, fuzzy, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
-
-#: src/util/getopt_helpers.c:743
-#, fuzzy, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
-msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
-
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:806
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:876
-#, fuzzy, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
-
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
-msgstr ""
-
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
-msgstr ""
-
-#: src/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
-msgstr "GNUnet-Konfigurationsdateien bearbeiten"
-
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:95
-#, c-format
-msgid "Failed to open `%s': %s\n"
-msgstr "»%s« kann nicht geöffnet werden: %s\n"
-
-#: src/util/gnunet-ecc.c:129
-#, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:178
-#, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
-msgstr ""
-"\n"
-"Schreiben in »%s« nicht möglich: %s\n"
-
-#: src/util/gnunet-ecc.c:185
-#, c-format
-msgid ""
-"\n"
-"Finished!\n"
-msgstr ""
-"\n"
-"Abgeschlossen!\n"
-
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:304
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' not found\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/util/gnunet-ecc.c:314
-#, c-format
-msgid "Hostkeys file `%s' is empty\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:334
-#, fuzzy, c-format
-msgid "Could not read hostkey file: %s\n"
-msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
-
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:479
-msgid "print the public key in HEX format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:499
-msgid "Manipulate GNUnet private ECC key files"
-msgstr ""
-
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Datei `%s' hat URI: %s\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/util/gnunet-qr.c:161
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
-msgstr "URL beginnt nicht mit »%s«\n"
-
-#: src/util/gnunet-qr.c:171
-#, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:182
-#, c-format
-msgid "No known handler for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "»%s« kann nicht geöffnet werden: %s\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "%s wird gestartet …\n"
-
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
-#, c-format
-msgid "Got %d images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
-#, c-format
-msgid "Found %s: \"%s\"\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/util/gnunet-qr.c:546
-#, fuzzy
-msgid "No data found\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
-msgstr ""
-
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
-msgstr ""
-
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:183
-msgid "Use built-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:215
-#, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
-
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:313
-msgid "Manipulate GNUnet proof of work files"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:1288
+#: src/service/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:95
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "URL beginnt nicht mit »%s«\n"
-
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:109
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
-msgstr ""
-
-#: src/util/helper.c:304
-#, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "Fehler beim Lesen von »%s«: %s\n"
-
-#: src/util/helper.c:356
-#, fuzzy, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/util/helper.c:571
-#, fuzzy, c-format
-msgid "Error writing to `%s': %s\n"
-msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
-msgstr ""
-
-#: src/util/network.c:1284
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
-
-#: src/util/os_installation.c:416
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr ""
-
-#: src/util/os_installation.c:787
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
-
-#: src/util/os_installation.c:820
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n"
-
-#: src/util/plugin.c:158
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr ""
-"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
-
-#: src/util/plugin.c:215
-#, fuzzy, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
-
-#: src/util/plugin.c:371
-#, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-
-#: src/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "GNUnet Konfiguration"
-
-#: src/util/regex.c:123
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:243
-#, fuzzy, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
-msgstr ""
-"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
-"positive Zahl angeben.\n"
-
-#: src/util/resolver_api.c:888
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:1086
-#, fuzzy
-msgid "Resolver not configured correctly.\n"
-msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
-
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-
-#: src/util/service.c:654
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
-msgstr ""
-
-#: src/util/service.c:838
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/util/service.c:951
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:992
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:1401
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-
-#: src/util/service.c:1413
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
-
-#: src/util/service.c:1420
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
-
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr ""
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
-
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/service.c:2099
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "GNUnet Konfiguration"
-
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
-msgstr ""
-
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
-msgstr ""
-
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
-msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
-
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
-msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n"
-
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n"
-
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n"
-
-#: src/util/strings.c:1081
-#, fuzzy, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "Ungültige Antwort auf `%s' von `%s'\n"
-
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
-msgstr "Port außerhalb des Bereichs\n"
-
-#: src/util/strings.c:1283
-#, c-format
-msgid "Malformed port policy `%s'\n"
-msgstr ""
-
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ungültiges Format für IP: »%s«\n"
-
-#: src/util/strings.c:1408
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
-
-#: src/util/strings.c:1459
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Ungültiges Format für IP: `%s'\n"
-
-#: src/util/strings.c:1501
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
-
-#: src/util/strings.c:1551
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Falsches Format `%s' für Netzmaske: %s\n"
-
-#: src/util/strings.c:1582
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Falsches Format `%s' für Netzwerk: %s\n"
-
-#: src/util/time.c:901 src/util/time.c:929
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/util/time.c:937
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# aktive Kanäle"
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr ""
 "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
 "schlug fehl."
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 #, 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:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:142
-msgid "Error creating tunnel\n"
-msgstr "Fehler beim Anlegen des Tunnels\n"
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr "Option »%s« ergibt keinen Sinn mit der Option »%s«.\n"
-
-#: src/vpn/gnunet-vpn.c:202
-#, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:216
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr "Option »%s« oder »%s« ergibt keinen Sinn mit der Option »%s«.\n"
-
-#: src/vpn/gnunet-vpn.c:239
-#, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "»%s« ist kein gültiger Knoten-Bezeichner.\n"
-
-#: src/vpn/gnunet-vpn.c:258
-#, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "»%s« ist keine gültige IP-Adresse.\n"
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr "Ziel-IP des Tunnels"
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr "Name des Dienstes, auf den zugegriffen werden soll"
-
-#: src/vpn/gnunet-vpn.c:334
-msgid "service is offered via TCP"
-msgstr "Dienst wird über TCP angeboten"
-
-#: src/vpn/gnunet-vpn.c:339
-msgid "service is offered via UDP"
-msgstr "Dienst wird über UDP angeboten"
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr "Tunnel über VPN einrichten."
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
diff --git a/po/es.po b/po/es.po
index 78d6c814c..d5757ddf0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,203 +18,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "'%s': servicio desconocido: %s\n"
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, fuzzy, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr "El bloque del tipo %u está mal formado\n"
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
-
-#: src/abd/gnunet-abd.c:566
-#, fuzzy
-msgid "Ego does not exist!\n"
-msgstr "El número de clave %u no existe\n"
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, fuzzy, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr "El bloque del tipo %u está mal formado\n"
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, fuzzy, c-format
-msgid "ego required\n"
-msgstr "Tipo requerido\n"
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, fuzzy, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr "El bloque del tipo %u está mal formado\n"
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-#, fuzzy
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-#, fuzzy
-msgid "The public key of the authority to verify the credential against"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/abd/gnunet-abd.c:1030
-#, fuzzy
-msgid "The ego/zone name to use"
-msgstr "tamaño del mensaje"
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-#, fuzzy
-msgid "GNUnet abd resolver tool"
-msgstr "Herramienta de acceso GNUnet GNS"
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 #, fuzzy
 msgid "is started already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "'%s' comenzando\n"
@@ -222,405 +81,2481 @@ msgstr "'%s' comenzando\n"
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
 # otro mensaje.
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 #, fuzzy
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Error al comunicar con el ARM. ¿Está el ARM ejecutándose?\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr "Ahora solo monitorizando, pulsa CTRL-C para parar.\n"
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s detenido.\n"
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Deteniendo %s...\n"
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr "borrar el directorio y el fichero de configuración al salir"
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr "monitoriza actividades de ARM"
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr "sale con estado de error si la operación no termina despues del DELAY"
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr "no permite heredar la salida estándar a «gnunet-service-arm»"
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr "no permite heredar la salida de error estándar a «gnunet-service-arm»"
 
 # Miguel: ARM se mantiene en todo el texto, aquí está la traducción.
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/cli/cadet/gnunet-cadet.c:685
+#, c-format
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:746
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/cli/cadet/gnunet-cadet.c:775
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Colección detenida.\n"
+
+#: src/cli/cadet/gnunet-cadet.c:800
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:817
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cli/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cli/cadet/gnunet-cadet.c:827
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "proveer información acerca de un túnel en particular"
+
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr "# amigos conectados"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:99
+#, fuzzy
+msgid "key received"
+msgstr "# claves de sesión recibidas"
+
+#: src/cli/core/gnunet-core.c:103
+#, fuzzy
+msgid "connection established"
+msgstr "Colección detenida.\n"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "Desconectado de"
+
+#: src/cli/core/gnunet-core.c:120
+#, fuzzy
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "<tiempo desconocido>"
+
+#: src/cli/core/gnunet-core.c:129
+#, fuzzy, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
+
+#: src/cli/core/gnunet-core.c:157
+#, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Parámetro no válido «%s» en la línea de comandos\n"
+
+#: src/cli/core/gnunet-core.c:163
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+# Miguel: ¿Quizá continuamente fuese mejor?
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+msgid "provide information about all current connections (continuously)"
+msgstr ""
+"provee información sobre todas las conexiones actuales (de forma continua)"
+
+#: src/cli/core/gnunet-core.c:196
+msgid "Print information about connected peers."
+msgstr "Imprime información sobre los pares conectados."
+
+#: src/cli/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:257
+#, fuzzy, c-format
+msgid "Error queueing datastore GET operation\n"
+msgstr "Error leyendo «%s»: %s"
+
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/cli/datastore/gnunet-datastore.c:319
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Se produjo un fallo al abrir «%s» para escritura"
+
+#: src/cli/datastore/gnunet-datastore.c:331
+#, fuzzy, c-format
+msgid "Inserted %<PRIu64> records\n"
+msgstr "establece registros de clase A"
+
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:378
+#, fuzzy, c-format
+msgid "Error queueing datastore PUT operation\n"
+msgstr "Error leyendo «%s»: %s"
+
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "Se produjo un fallo al conectar con el almacén de datos."
+
+#: src/cli/datastore/gnunet-datastore.c:454
+#, fuzzy, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n"
+
+#: src/cli/datastore/gnunet-datastore.c:477
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr "Buscar el registro para el nombre dado"
+
+#: src/cli/datastore/gnunet-datastore.c:482
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# bytes mandados al almacén de datos"
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:498
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "Manipular ficheros de configuración de GNUnet"
+
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
-"Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
-"fallo al crear un «socket» IPv6: %s\n"
+"Resultado %d, tipo %d:\n"
+"%.*s\n"
+
+#: src/cli/dht/gnunet-dht-get.c:167
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+"Resultado %d, tipo %d:\n"
+"%.*s\n"
+
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
+msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Failed to connect to DHT service!\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#: src/cli/dht/gnunet-dht-get.c:256
+#, fuzzy
+msgid "Issuing DHT GET with key"
+msgstr "Enviando un «GET» DHT con clave"
+
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
+msgstr "la clave de búsqueda"
+
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
+msgstr "cuantas peticiones paralelas (réplicas) crear"
+
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+#, fuzzy
+msgid "use DHT's record route option"
+msgstr "opción para usar el demultiplexado de la DHT siempre"
+
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
+msgstr "el tipo de datos a buscar"
+
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
+msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?"
+
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
+msgstr "opción para usar el demultiplexado de la DHT siempre"
+
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
-"¡Se requiere un número de puerto válido para el servicio «%s» en la "
-"configuración!\n"
+"Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
+
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
+msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
+
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
+msgstr "ser prolijo (imprime información de progreso)"
+
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
+msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
+msgstr "los datos a insertar bajo la clave"
+
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
+
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
+msgstr "cuantas réplicas crear"
+
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
+msgstr "el tipo de datos a insertar"
+
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
-"La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
+"Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
+"«KEY»."
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
+#: src/cli/fs/gnunet-auto-share.c:234
 #, c-format
-msgid "Using `%s' instead\n"
-msgstr "Usando «%s» en su defecto\n"
+msgid "Failed to load state: %s\n"
+msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
+#, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Se produjo un fallo al guardar el estado en el fichero %s\n"
+
+#: src/cli/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr "Publicación de «%s» finalizada\n"
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
+#: src/cli/fs/gnunet-auto-share.c:480
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr "Publicando «%s»\n"
+
+#: src/cli/fs/gnunet-auto-share.c:491
+#, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Se produjo un fallo al ejecutar «%s»\n"
+
+#: src/cli/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
-"Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
-"«%s», no se pudo crear un «socket» UNIX: %s\n"
+"Debes especificar uno y solo un nombre de directorio para publicación "
+"automática.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+"deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
+
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
+msgstr "no usar libextractor para añadir palabras clave o metadatos"
+
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr "especificar la prioridad del contenido"
+
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
+msgstr "establece el nivel LEVEL deseado de replicación"
+
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
+
+#: src/cli/fs/gnunet-directory.c:54
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr "\t<fichero original embebido en %u bytes de metadatos>\n"
+
+#: src/cli/fs/gnunet-directory.c:106
+#, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "Metadatos del directorio «%s»:\n"
+
+#: src/cli/fs/gnunet-directory.c:109
+#, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "Contenidos del directorio «%s»:\n"
+
+#: src/cli/fs/gnunet-directory.c:146
+msgid "You must specify a filename to inspect.\n"
+msgstr "Debes especificar un fichero a inspeccionar.\n"
+
+#: src/cli/fs/gnunet-directory.c:160
+#, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Se produjo un fallo al leer el directorio «%s»\n"
+
+#: src/cli/fs/gnunet-directory.c:170
+#, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "«%s» no es un directorio GNUnet\n"
+
+#: src/cli/fs/gnunet-directory.c:201
+msgid "Display contents of a GNUnet directory"
+msgstr "Muestra los contenidos de un directorio GNUnet"
+
+#: src/cli/fs/gnunet-download.c:131
+#, c-format
+msgid "Starting download `%s'.\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/cli/fs/gnunet-download.c:143
+msgid "<unknown time>"
+msgstr "<tiempo desconocido>"
+
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
-"No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
-"uno es necesario\n"
+"Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en "
+"descargarse\n"
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
+#: src/cli/fs/gnunet-download.c:177
 #, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Se produjo un fallo al resolver «%s»: %s\n"
+msgid "Error downloading: %s.\n"
+msgstr "Error descargando: %s.\n"
 
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
+#: src/cli/fs/gnunet-download.c:189
 #, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "No se encontró la dirección %s para «%s».\n"
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/arm/gnunet-service-arm.c:951
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
 #, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+msgid "Unexpected status: %d\n"
+msgstr "Estado inesperado: %d\n"
+
+#: src/cli/fs/gnunet-download.c:234
+msgid "You need to specify a URI argument.\n"
+msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/arm/gnunet-service-arm.c:962
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
 #, c-format
-msgid "Starting service `%s'\n"
-msgstr "Iniciando el servicio «%s»\n"
+msgid "Failed to parse URI: %s\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-# Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:1062
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr "Sólo URI «CHK» o «LOC» soportadas.\n"
+
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr "El nombre de fichero de destino debe ser especificado.\n"
+
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
 #, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n"
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "No se pudo inicializar el subsistema «%s».\n"
+
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
-#: src/arm/gnunet-service-arm.c:1093
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
+
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
+msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
+
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
+msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)"
+
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr "establece el número máximo de descargas paralelas permitido"
+
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr "establece el número máximo de peticiones de bloque paralelas permitido"
+
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
+msgstr "descarga un directorio de GNUnet recursivamente"
+
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+"Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
+"chk/...)"
+
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr "imprimir una lista de todos los ficheros indexados"
+
+#: src/cli/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr "Operaciones especiales de compartición de ficheros"
+
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
+
+#: src/cli/fs/gnunet-publish.c:247
+#, c-format
+msgid "Error publishing: %s.\n"
+msgstr "Error publicando: %s.\n"
+
+#: src/cli/fs/gnunet-publish.c:255
+#, c-format
+msgid "Publishing `%s' done.\n"
+msgstr "Publicación «%s» finalizada.\n"
+
+#: src/cli/fs/gnunet-publish.c:259
+#, c-format
+msgid "URI is `%s'.\n"
+msgstr "La URI es «%s».\n"
+
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "La URI es «%s».\n"
+
+#: src/cli/fs/gnunet-publish.c:280
+#, fuzzy
+msgid "Starting cleanup after abort\n"
+msgstr "Limpieza completada\n"
+
+#: src/cli/fs/gnunet-publish.c:287
+#, fuzzy
+msgid "Cleanup after abort completed.\n"
+msgstr "Limpieza completada\n"
+
+#: src/cli/fs/gnunet-publish.c:292
+#, fuzzy
+msgid "Cleanup after abort failed.\n"
+msgstr "Limpieza completada\n"
+
+#: src/cli/fs/gnunet-publish.c:426
+#, c-format
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "Metadatos para el fichero «%s» (%s)\n"
+
+#: src/cli/fs/gnunet-publish.c:428
+#, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "Palabras clave para el fichero «%s» (%s)\n"
+
+#: src/cli/fs/gnunet-publish.c:583
+msgid "Could not publish\n"
+msgstr "No se pudo publicar\n"
+
+#: src/cli/fs/gnunet-publish.c:612
+msgid "Could not start publishing.\n"
+msgstr "No se pudo empezar a publicar.\n"
+
+#: src/cli/fs/gnunet-publish.c:645
+#, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/cli/fs/gnunet-publish.c:647
+#, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Escaneando fichero «%s».\n"
+
+#: src/cli/fs/gnunet-publish.c:653
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
+
+#: src/cli/fs/gnunet-publish.c:659
+msgid "Preprocessing complete.\n"
+msgstr "Preprocesado completo.\n"
+
+#: src/cli/fs/gnunet-publish.c:665
+#, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Extracción de metadatos del fichero «%s» completa.\n"
+
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
+msgstr "La extracción de metadatos ha finalizado.\n"
+
+#: src/cli/fs/gnunet-publish.c:679
+#, fuzzy
+msgid "Error scanning directory.\n"
+msgstr "Error interno escaneando directorio.\n"
+
+#: src/cli/fs/gnunet-publish.c:706
+#, fuzzy, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Espacio de nombres «%s» desconocido.\n"
+
+#: src/cli/fs/gnunet-publish.c:738
+#, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Se produjo un fallo al acceder «%s»: %s\n"
+
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
-"Imposible asociar el «socket» de escucha para el servicio «%s» a la "
-"dirección «%s»: %s\n"
+"Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
+"«gnunet-helper-publish-fs» instalado?\n"
 
-# Miguel: He traducido "monitor" por gestionar,
-# no es exactamente lo mismo que el texto en inglés, pero
-# es fiel a la realidad puesto que el ARM reinicia
-# las conexiones cuando se caen.
-#: src/arm/gnunet-service-arm.c:1124
+#: src/cli/fs/gnunet-publish.c:811
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
+msgid "Cannot extract metadata from a URI!\n"
+msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/fs/gnunet-publish.c:818
 #, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Preparando para parar «%s»\n"
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/fs/gnunet-publish.c:824
 #, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Reiniciando el servicio «%s»\n"
+msgid "You must NOT specify an URI and a filename.\n"
+msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
-msgstr "salida"
+#: src/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
-msgstr "señal"
+#: src/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, 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/arm/gnunet-service-arm.c:1765
-msgid "unknown"
-msgstr "desconocido"
+#: src/cli/fs/gnunet-publish.c:907
+#, fuzzy
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+"deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
+
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
+"pero sin realizar la subida"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"añadir una palabra clave adicional para el fichero del nivel más alto o el "
+"directorio (esta opción puede ser especificada varias veces)"
+
+#: src/cli/fs/gnunet-publish.c:928
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
+
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"no indexar, hacer inserciones totales (almacena el fichero entero de forma "
+"cifrada en la base de datos de GNUnet)"
+
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"especificar la ID de una versión actualizada para ser publicada en el futuro "
+"(para inserciones en el espacio de nombres únicamente)"
+
+#: src/cli/fs/gnunet-publish.c:953
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
+"publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
+"espacio)"
+
+#: src/cli/fs/gnunet-publish.c:965
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+"únicamente simular el proceso pero no publicar nada realmente (útil para "
+"calcular URI)"
+
+#: src/cli/fs/gnunet-publish.c:972
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+"establece la ID de esta versión de la publicación (para inserciones en el "
+"espacio únicamente)"
+
+#: src/cli/fs/gnunet-publish.c:980
+msgid ""
+"URI to be published (can be used instead of passing a file to add keywords "
+"to the file with the respective URI)"
+msgstr ""
+"URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
+"claves con el fichero con la URI respectiva)"
+
+#: src/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
+msgstr "Publicar un fichero o un directorio en GNUnet"
+
+#: src/cli/fs/gnunet-search.c:446
 #, c-format
-msgid "Service `%s' took %s to terminate\n"
-msgstr "El servicio «%s» tardó %s en finalizar\n"
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/cli/fs/gnunet-search.c:535
+#, c-format
+msgid "Error searching: %s.\n"
+msgstr "Error buscando: %s.\n"
+
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:629
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
+
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/fs/gnunet-search.c:662
 #, fuzzy, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
-msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr "No se pudo inicializar el subsistema «%s».\n"
+
+#: src/cli/fs/gnunet-search.c:676
+msgid "Could not start searching.\n"
+msgstr "No se pudo empezar a buscar.\n"
+
+#: src/cli/fs/gnunet-search.c:702
+#, fuzzy
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
+msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
+
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:789
+#, fuzzy
+msgid "Search for files that have been published on GNUnet\n"
+msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
+
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr "Desindexado en %llu/%llu (quedan %s)\n"
+
+#: src/cli/fs/gnunet-unindex.c:103
+#, c-format
+msgid "Error unindexing: %s.\n"
+msgstr "Error desindexando: %s.\n"
+
+#: src/cli/fs/gnunet-unindex.c:109
+msgid "Unindexing done.\n"
+msgstr "Desindexado finalizado.\n"
+
+#: src/cli/fs/gnunet-unindex.c:142
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Se debe especificar uno y solo un fichero para desindexar.\n"
+
+#: src/cli/fs/gnunet-unindex.c:162
+msgid "Could not start unindex operation.\n"
+msgstr "No se pudo empezar la operación de desindexado.\n"
+
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
+
+#: src/cli/gns/gnunet-gns.c:256
 #, fuzzy, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
-msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciar�� en %llu ms\n"
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "«%s» no es una direcci��n IP válida.\n"
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
-msgstr "Iniciando apagado bajo petición del cliente.\n"
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
+"%s\n"
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
-msgstr "descripción del elemento que está por vender"
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
-msgstr "figurando posibles precios"
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
-msgstr "maxima duración del turno"
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
-msgstr "duración hasta que la caución empieza"
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr "Buscar el registro para el nombre dado"
+
+#: src/cli/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/cli/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr "Sin salida innecesaria"
+
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
+#: src/cli/identity/gnunet-identity.c:225
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/auction/gnunet-auction-create.c:187
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:545
+#, fuzzy
+msgid "delete ego NAME "
+msgstr "borrar un nombre de espacio de nombres (NAME)"
+
+#: src/cli/identity/gnunet-identity.c:551
 msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
+#: src/cli/identity/gnunet-identity.c:572
 #, fuzzy
-msgid "public auction outcome"
-msgstr "_Opciones"
+msgid "display all egos"
+msgstr "mostrar registros"
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/identity/gnunet-identity.c:576
+#, fuzzy
+msgid "reduce output"
+msgstr "Sin salida innecesaria"
+
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+# Miguel: Aquí he dejado monitorización porque esto es
+# del servicio de traducción de direcciones.
+#: src/cli/identity/gnunet-identity.c:593
+#, fuzzy
+msgid "run in monitor mode egos"
+msgstr "modo de monitorización"
+
+#: src/cli/identity/gnunet-identity.c:597
+msgid "display private keys as well"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:105
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "No se han encontrado ficheros en «%s»\n"
+
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
+
+#: src/cli/namecache/gnunet-namecache.c:174
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Se debe especificar un apodo\n"
+
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/cli/namecache/gnunet-namecache.c:187
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
+msgstr "nombre del registro a añadir/borrar/mostrar"
+
+#: src/cli/namecache/gnunet-namecache.c:220
+#, fuzzy
+msgid "specifies the public key of the zone to look in"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+msgid "GNUnet zone manipulation tool"
+msgstr "Herramienta de manipulación de zona de GNUnet"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
+#, fuzzy, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr "Argumentos superfluos (ignorados).\n"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "Herramienta de manipulación de zona de GNUnet"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "'%s': servicio desconocido: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "nombre de la sección a la que acceder"
+
+#: src/cli/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Comando desconocido «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Formato no válido para la IP: «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr "No se pudo añadir el registro: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "No se pudo borrar el registro: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1302
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1327
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1356
+#, c-format
+msgid "No options given\n"
+msgstr "No se han proporcionado opciones\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1370
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Falta la opción «%s» para la operación «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1381
+#, fuzzy
+msgid "name"
+msgstr "sin nombre"
+
+#: src/cli/namestore/gnunet-namestore.c:1410
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr "añadir"
+
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Tipo no soportado «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1471
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Formato de tiempo no válido «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr "borrar"
+
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr "añadir registro"
+
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr "borrar registro"
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr "mostrar registros"
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2004
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+"tiempo de expiración del registro a usar (únicamente para añadir), nunca "
+"(\"never\") es posible"
+
+#: src/cli/namestore/gnunet-namestore.c:2010
+#, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "establece el nivel LEVEL deseado de replicación"
+
+#: src/cli/namestore/gnunet-namestore.c:2015
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
+
+#: src/cli/namestore/gnunet-namestore.c:2025
+#, fuzzy
+msgid "Output in recordline format"
+msgstr "salida en formato de gnuplot"
+
+#: src/cli/namestore/gnunet-namestore.c:2031
+#, fuzzy
+msgid "determine our name for the given KEY"
+msgstr "establece las preferencias para el par dado"
+
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
+msgstr "tipo del registro a añadir/borrar/mostrar"
+
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
+msgstr "URI a importar a nuestra zona"
+
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
+msgstr "valor del registro a añadir/borrar"
+
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
+msgstr "crear o listar registros públicos"
+
+#: src/cli/namestore/gnunet-namestore.c:2056
+#, fuzzy
+msgid "omit private records"
+msgstr "mostrar registros"
+
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr "Configuración de GNUnet"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Se produjo un fallo al guardar la nueva configuración al disco"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "No se pudo acceder al fichero de configuración «%s»\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "Configuración de GNUnet"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "write configuration file (for autoconfiguration)"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
+
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:453
+#, fuzzy
+msgid "watch for connection reversal requests"
+msgstr "# pares desconectados debido a petición externa"
+
+#: src/cli/nat/gnunet-nat.c:464
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
+
+#: src/cli/nse/gnunet-nse.c:124
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# Estimaciones del tamaño de red recibidas"
+
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "el parámetro --section es necesario\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:852
+#, fuzzy
+msgid "The EGO to use"
+msgstr "tamaño del mensaje"
+
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
+
+# Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
+# Esto también es aplicable a las siguientes traducciones.
+#: src/cli/revocation/gnunet-revocation.c:150
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "El servicio «%s» se ha parado.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:154
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Error interno."
+
+#: src/cli/revocation/gnunet-revocation.c:180
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:183
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "La operación ha fallado.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:189
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:334
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "Módulo «%s» no encontrado\n"
+
+#: src/cli/revocation/gnunet-revocation.c:350
+#, fuzzy, c-format
+msgid "Error: Key is invalid\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:424
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/cli/revocation/gnunet-revocation.c:434
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:464
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
+
+#: src/cli/revocation/gnunet-revocation.c:481
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
+
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
+
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:558
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "número de pares para empezar"
+
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
 msgid "help text"
 msgstr "texto de ayuda"
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+msgid "Failed to obtain statistics.\n"
+msgstr "Se produjo un fallo al obtener las estadísticas.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
+#, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr ""
+"Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
+
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
+msgstr "Falta el parámetro: subsistema\n"
+
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
+msgstr "Falta el argumento: nombre\n"
+
+#: src/cli/statistics/gnunet-statistics.c:577
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr "No se proporcionó un subsistema o un nombre\n"
+
+#: src/cli/statistics/gnunet-statistics.c:589
+#, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
+
+#: src/cli/statistics/gnunet-statistics.c:725
+#, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/cli/statistics/gnunet-statistics.c:742
+#, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
+
+#: src/cli/statistics/gnunet-statistics.c:751
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
+
+#: src/cli/statistics/gnunet-statistics.c:783
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
+msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
+
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
+msgstr "hacer el valor persistente"
+
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
+msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
+
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
+msgstr "imprime el valor de las estadísticas"
+
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
+msgstr "visualiza el valor continuamente"
+
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
+msgstr "conectar a equipo remoto"
+
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
+msgstr "puerto del equipo remoto"
+
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
+msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:192
+msgid "Manipulate GNUnet configuration files"
+msgstr "Manipular ficheros de configuración de GNUnet"
+
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:95
+#, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Se produjo un fallo al abrir «%s»: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:129
 #, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
+msgid "Generating %u keys like %s, please wait"
+msgstr "Generando %u claves, por favor, espere"
+
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr "Generando %u claves, por favor, espere"
+
+#: src/cli/util/gnunet-ecc.c:178
+#, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr ""
+"\n"
+"Se produjo un fallo al escribir en «%s»: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:185
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Finished!\n"
+msgstr "¡Finalizado!\n"
+
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:304
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "El fichero de máquinas %s no fue encontrado\n"
+
+#: src/cli/util/gnunet-ecc.c:314
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "El archivo de amigos «%s» está vacío.\n"
+
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:334
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "¡No se puede leer el fichero de claves de máquina!\n"
+
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
+msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
+
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
+
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
+msgstr "imprime la clave pública en formato ASCII"
+
+#: src/cli/util/gnunet-ecc.c:474
+#, fuzzy
+msgid "print the private key in ASCII format"
+msgstr "imprime la clave pública en formato ASCII"
+
+#: src/cli/util/gnunet-ecc.c:479
+#, fuzzy
+msgid "print the public key in HEX format"
+msgstr "imprime la clave pública en formato ASCII"
+
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:499
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
+
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/util/gnunet-qr.c:161
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
+msgstr "URI no válida: no comienza con «%s»\n"
+
+#: src/cli/util/gnunet-qr.c:171
+#, fuzzy, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
+msgstr "URI no válida: falla al especificar el subsistema\n"
+
+#: src/cli/util/gnunet-qr.c:182
+#, fuzzy, c-format
+msgid "No known handler for subsystem `%s'\n"
+msgstr "No hay un manejador conocido para el subsistema «%s»\n"
+
+#: src/cli/util/gnunet-qr.c:218
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Se produjo un fallo al iniciar el proceso «ssh».\n"
+
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Se produjo un fallo al abrir «%s»: %s\n"
+
+#: src/cli/util/gnunet-qr.c:261
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
 #, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
+msgid "Found %s: \"%s\"\n"
+msgstr "Yo soy el par '%s'.\n"
 
-#: src/cadet/gnunet-cadet.c:775
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "«%s» no es un directorio GNUnet\n"
+
+#: src/cli/util/gnunet-qr.c:546
 #, fuzzy
-msgid "No action requested\n"
-msgstr "Colección detenida.\n"
+msgid "No data found\n"
+msgstr "«upnpc» no encontrado\n"
+
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:800
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
+msgstr "realizar una búsqueda inversa"
+
+#: src/cli/util/gnunet-resolver.c:183
 #, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "proveer información acerca de un túnel en particular"
+msgid "Use built-in GNUnet stub resolver"
+msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/util/gnunet-scrypt.c:215
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
+
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+msgid "Value is too large.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:313
 #, fuzzy
-msgid "Provide information about a patricular peer"
-msgstr "proveer información acerca de un túnel en particular"
+msgid "Manipulate GNUnet proof of work files"
+msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n"
+
+#: src/cli/util/gnunet-uri.c:95
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "URI no válida: no comienza con «%s»\n"
+
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr "URI no válida: falla al especificar el subsistema\n"
+
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr "No hay un manejador conocido para el subsistema «%s»\n"
+
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
+msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
+
+#: src/cli/vpn/gnunet-vpn.c:142
+msgid "Error creating tunnel\n"
+msgstr "Error creando el túnel\n"
+
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
+#, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "La opción «%s» no tiene sentido con la opción «%s».\n"
+
+#: src/cli/vpn/gnunet-vpn.c:202
+#, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:216
+#, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n"
+
+#: src/cli/vpn/gnunet-vpn.c:239
+#, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "«%s» no es un identificador de par válido\n"
+
+#: src/cli/vpn/gnunet-vpn.c:258
+#, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
+msgstr "petición cuyo resultado debe ser una dirección IPv4"
+
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
+msgstr "petición cuyo resultado debe ser una dirección IPv6"
+
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?"
+
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
+msgstr "IP de destino para el túnel"
+
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
+msgstr "par que ofrece el servicio al que nos gustaría acceder"
+
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
+msgstr "nombre del servicio al que nos gustaría acceder"
+
+#: src/cli/vpn/gnunet-vpn.c:334
+msgid "service is offered via TCP"
+msgstr "el servicio es ofrecido vía TCP"
+
+#: src/cli/vpn/gnunet-vpn.c:339
+msgid "service is offered via UDP"
+msgstr "el servicio es ofrecido vía UDP"
+
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr "Configurar túneles vía VPN."
+
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:566
 #, fuzzy
-msgid "Provide information about all peers"
-msgstr "proveer información acerca de un túnel en particular"
+msgid "Ego does not exist!\n"
+msgstr "El número de clave %u no existe\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, fuzzy, c-format
+msgid "ego required\n"
+msgstr "Tipo requerido\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:890
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:827
+#: src/contrib/service/abd/gnunet-abd.c:983
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1011
 #, fuzzy
-msgid "Provide information about all tunnels"
-msgstr "proveer información acerca de un túnel en particular"
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1025
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/contrib/service/abd/gnunet-abd.c:1030
+#, fuzzy
+msgid "The ego/zone name to use"
+msgstr "tamaño del mensaje"
+
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1098
+#, fuzzy
+msgid "GNUnet abd resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr "descripción del elemento que está por vender"
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr "figurando posibles precios"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr "maxima duración del turno"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
+msgstr "duración hasta que la caución empieza"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+#, fuzzy
+msgid "public auction outcome"
+msgstr "_Opciones"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
 #, fuzzy
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
 msgid ""
 "\n"
@@ -628,871 +2563,2283 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/contrib/service/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
+#: src/contrib/service/conversation/gnunet-conversation.c:287
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/contrib/service/conversation/gnunet-conversation.c:356
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
+#: src/contrib/service/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
+#: src/contrib/service/conversation/gnunet-conversation.c:398
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
+#: src/contrib/service/conversation/gnunet-conversation.c:548
 #, c-format
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:607
+#: src/contrib/service/conversation/gnunet-conversation.c:607
 #, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/contrib/service/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/contrib/service/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/contrib/service/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/contrib/service/conversation/gnunet-conversation.c:680
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/contrib/service/conversation/gnunet-conversation.c:696
 #, c-format
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/contrib/service/conversation/gnunet-conversation.c:705
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/contrib/service/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:728
+#: src/contrib/service/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/contrib/service/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
+#: src/contrib/service/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/contrib/service/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/contrib/service/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/contrib/service/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/contrib/service/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/contrib/service/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/contrib/service/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/contrib/service/conversation/gnunet-conversation.c:958
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/contrib/service/conversation/gnunet-conversation.c:961
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/contrib/service/conversation/gnunet-conversation.c:964
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#: src/conversation/gnunet-conversation.c:1124
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:1134
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1166
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/conversation/gnunet-conversation.c:1193
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Colección detenida.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
 #, fuzzy
 msgid "Wrong Spec\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# reconexiones rápidas fallidas"
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "# reconexiones rápidas fallidas"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:504
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:509
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "Conectado a %s.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:703
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
 #, fuzzy
 msgid "ogg_stream_init() failed.\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/conversation/microphone.c:118
+#: src/contrib/service/conversation/microphone.c:118
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "No se pudo empezar la operación de desindexado.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, fuzzy, c-format
 msgid "PHONE version %u not supported\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/conversation/speaker.c:73
+#: src/contrib/service/conversation/speaker.c:73
 #, fuzzy
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/gnunet-core.c:91
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
+msgid "number of peers to start"
+msgstr "número de pares para empezar"
+
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
 #, fuzzy
-msgid "fresh connection"
-msgstr "# amigos conectados"
+msgid "duration of the profiling"
+msgstr ""
+"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
+#, fuzzy
+msgid "timeout for the profiling"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "número de pares para empezar"
+
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "Medir la calidad y rendimiento del servicio NSE."
+
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
-msgid "key received"
-msgstr "# claves de sesión recibidas"
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Debes especificar un fichero a inspeccionar.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "No se pudo conectar al servicio %s.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
 
-#: src/core/gnunet-core.c:103
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
 #, fuzzy
-msgid "connection established"
-msgstr "Colección detenida.\n"
+msgid "Connect to CADET failed\n"
+msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:111
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
+msgid "number of peers in consensus"
+msgstr "número de pares en consenso"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
 #, fuzzy
-msgid "disconnected"
-msgstr "Desconectado de"
+msgid "Could not connect to CADET service\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
+
+# Miguel: Conjunto resta.
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+msgid "number of element in set A-B"
+msgstr "número de elementos en el conjunto A-B"
 
-#: src/core/gnunet-core.c:120
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+msgid "number of element in set B-A"
+msgstr "número de elementos en el conjunto B-A"
+
+# Miguel: Conjunto unión.
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
+msgstr "número de elementos comunes en A y B"
+
+# Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr "número de hash"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr "tamaño ibf"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+msgid "number of values"
+msgstr "número de valores"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
 #, fuzzy
-msgid "Connection to CORE service lost (reconnecting)"
+msgid "write statistics to file"
+msgstr "imprime el valor de las estadísticas"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
+msgid "No error (success)."
 msgstr ""
-"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:124
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
-msgid "unknown state"
-msgstr "<tiempo desconocido>"
+msgid "Unknown and unspecified error."
+msgstr "Error desconocido"
+
+# Miguel: ¿Conectar y conexión?
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Error al comunicar con el servicio ARM.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
+#, fuzzy
+msgid "Ego not found."
+msgstr "Contenido no encontrado"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Error desconocido"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# sesiones wlan creadas"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
+#, fuzzy
+msgid "Zone not found."
+msgstr "Contenido no encontrado"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
+#, fuzzy
+msgid "Record not found."
+msgstr "«upnpc» no encontrado\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
+#, fuzzy
+msgid "Zone does not contain any records."
+msgstr "El fichero '%s' no contiene un pseudónimo.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
+#, fuzzy
+msgid "No records given."
+msgstr "No se han proporcionado opciones\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
+msgid "Record data invalid."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
+#, fuzzy
+msgid "No label given."
+msgstr "No se han proporcionado opciones\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
+#, fuzzy
+msgid "No results given."
+msgstr "No se han proporcionado opciones\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
+#, fuzzy
+msgid "Record already exists."
+msgstr "El registro ya existía en el almacén de nombres"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
+msgid "Label invalid or malformed."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
+#, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Error accediendo al fichero «%s»: %s\n"
+
+#: src/lib/hello/gnunet-hello.c:310
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr "El fichero «%s» es demasiado grande para ser un «HELLO»\n"
+
+#: src/lib/hello/gnunet-hello.c:315
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr "El fichero «%s» es demasiado pequeño para ser un «HELLO»\n"
+
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
+#, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Error abriendo fichero «%s»: %s\n"
+
+#: src/lib/hello/gnunet-hello.c:339
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "No se encontró un «HELLO» bien formado en el fichero «%s»\n"
 
-#: src/core/gnunet-core.c:129
+#: src/lib/hello/gnunet-hello.c:386
 #, fuzzy, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
-msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 
-#: src/core/gnunet-core.c:157
+#: src/lib/hello/gnunet-hello.c:395
 #, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Modified %u addresses, wrote %u bytes\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:409
+#, fuzzy
+msgid "Hello file to read"
+msgstr "fichero pem para usar como autoridad de certificación (CA)"
+
+#: src/lib/hello/gnunet-hello.c:418
+msgid "Print information about peers."
+msgstr "Imprimir información sobre los pares."
+
+#: src/lib/hello/hello.c:1089
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr ""
+"Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
+"expiración\n"
+
+#: src/lib/hello/hello.c:1099
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr ""
+"Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
+"válido\n"
+
+#: src/lib/hello/hello.c:1109
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
+
+#: src/lib/hello/hello.c:1121
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+"Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
+"transporte\n"
+
+#: src/lib/hello/hello.c:1139
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr "Módulo «%s» no encontrado\n"
+
+#: src/lib/hello/hello.c:1147
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr "El módulo «%s» no soporta URI todavía\n"
+
+#: src/lib/hello/hello.c:1162
+#, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr ""
+"Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
+
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/lib/sq/sq.c:47
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Error leyendo «%s»: %s"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr "Fin del fichero"
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Error decodificando clave %u\n"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
+msgstr ""
+
+#: src/lib/util/bio.c:312
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
-#: src/core/gnunet-core.c:163
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
+
+#: src/lib/util/bio.c:345
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Error decodificando clave %u\n"
+
+#: src/lib/util/bio.c:350
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr "Se produjo un error leyendo la cadena «%s»"
+
+#: src/lib/util/bio.c:363
+#, fuzzy, c-format
+msgid "String `%s' longer than allowed (%u > %lu)"
+msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
+
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Error decodificando clave %u\n"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
+msgstr ""
+
+#: src/lib/util/bio.c:773
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Formato de tiempo no válido «%s»\n"
+
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+"La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
+
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr "Usando «%s» en su defecto\n"
+
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
+
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:910
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
+
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "ERROR"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "PELIGRO"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
+msgstr "MENSAJE"
+
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "INFORMACIÓN"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "DEPURACIÓN"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr "NINGUNO"
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr "NO VÁLIDO"
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr "dirección desconocida"
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr "dirección no válida"
+
+#: src/lib/util/common_logging.c:1416
+#, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
+
+#: src/lib/util/common_logging.c:1431
+#, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+"La configuración especifica un valor no válido en la opción «%s» de la "
+"sección «%s»: %s\n"
+
+#: src/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/configuration.c:1718
 #, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+msgid "Not a valid relative time specification"
+msgstr "Tiempo de expiración no válido para la operación «%s»\n"
 
-# Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
-msgid "provide information about all current connections (continuously)"
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
-"provee información sobre todas las conexiones actuales (de forma continua)"
+"El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
+"de las opciones legales\n"
 
-#: src/core/gnunet-core.c:196
-msgid "Print information about connected peers."
-msgstr "Imprime información sobre los pares conectados."
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:148
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "el parámetro --section es necesario\n"
+
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr "el parámetro --option es necesario para establecer un valor\n"
+
+#: src/lib/util/configuration_helper.c:263
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+"El tamaño del fichero en disco es incorrecto para este «Bloom "
+"filter» (esperado %llu, tiene %llu)\n"
+
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "«%s» falló en %s: %d con el error: %s\n"
+
+#: src/lib/util/crypto_ecc.c:554
+#, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "El firmado ECC falló en %s:%d: %s\n"
+
+#: src/lib/util/crypto_ecc.c:677
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
+
+#: src/lib/util/crypto_ecc_setup.c:282
+#, fuzzy
+msgid "Could not load peer's private key\n"
+msgstr "No se pudo acceder a la clave de máquina.\n"
+
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
+
+#: src/lib/util/crypto_rsa.c:908
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "El firmado ECC falló en %s:%d: %s\n"
+
+#: src/lib/util/crypto_rsa.c:1208
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
+
+#: src/lib/util/disk.c:843
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
+
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
+
+#: src/lib/util/dnsparser.c:910
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr ""
+"Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
+"IDNA: %s\n"
+
+#: src/lib/util/dnsstub.c:228
+#, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "No se pudo asociar con ningún puerto: %s\n"
+
+#: src/lib/util/dnsstub.c:371
+#, fuzzy, c-format
+msgid "Received DNS response that is too small (%u bytes)\n"
+msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
+
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
+
+#: src/lib/util/dnsstub.c:509
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Petición DNS enviada a %s\n"
+
+#: src/lib/util/getopt.c:566
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: la opción «%s» es ambigua\n"
+
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: la opción «--%s» no permite un parámetro\n"
+
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: la opción «%c%s» no permite un parámetro\n"
+
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: la opción «%s» requiere un parámetro\n"
+
+#: src/lib/util/getopt.c:648
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opción no reconocida «--%s»\n"
+
+#: src/lib/util/getopt.c:654
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opción no reconocida «%c%s»\n"
+
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opción ilegal -- %c\n"
+
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opción no válida -- %c\n"
+
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opción requiere un parámetro -- %c\n"
+
+#: src/lib/util/getopt.c:762
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: la opción «-W %s» es ambigua\n"
+
+#: src/lib/util/getopt.c:782
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: la opción «-W %s» no permite un parámetro\n"
+
+#: src/lib/util/getopt.c:971
+#, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "Use %s para obtener una lista de opciones.\n"
+
+#: src/lib/util/getopt.c:984
+#, fuzzy, c-format
+msgid "Option `%s' can't be used with other options.\n"
+msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
+
+#: src/lib/util/getopt.c:996
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Falta la opción «%s» para la operación «%s»\n"
+
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
+msgstr "imprime el número de versión"
+
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Los parámetros obligatorios para las opciones largas también lo son para sus "
+"versiones cortas.\n"
+
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
+msgstr "imprime esta ayuda"
+
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:463
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "crear ficheros de configuración únicos"
+
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción «%s».\n"
+
+#: src/lib/util/getopt_helpers.c:571
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
+
+#: src/lib/util/getopt_helpers.c:578
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:632
+#, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
+
+#: src/lib/util/getopt_helpers.c:686
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
+
+#: src/lib/util/getopt_helpers.c:743
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción «%s».\n"
+
+#: src/lib/util/getopt_helpers.c:750
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:876
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción «%s».\n"
+
+#: src/lib/util/getopt_helpers.c:954
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/lib/util/helper.c:304
+#, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Error leyendo de «%s»: %s\n"
+
+#: src/lib/util/helper.c:356
+#, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr ""
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
+
+#: src/lib/util/helper.c:571
+#, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Error escribiendo a «%s»: %s\n"
+
+#: src/lib/util/network.c:163
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
+
+#: src/lib/util/network.c:1284
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+"¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
+"CTRL-C)!\n"
+
+#: src/lib/util/os_installation.c:416
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+"No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
+"de entorno «%s».\n"
+
+#: src/lib/util/os_installation.c:787
+#, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
+
+#: src/lib/util/os_installation.c:820
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
+
+#: src/lib/util/plugin.c:158
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
+
+#: src/lib/util/plugin.c:215
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
+
+#: src/lib/util/plugin.c:371
+msgid "Could not determine plugin installation path.\n"
+msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
+
+#: src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:243
+#, fuzzy, c-format
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
+msgstr ""
+"¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
+"la configuración!\n"
+
+#: src/lib/util/resolver_api.c:888
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
+
+#: src/lib/util/resolver_api.c:901
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
+
+# Miguel: He traducido "default" por "predeterminado", la locución
+# "por defecto" no tiene sentido en sitios como este y he tratado
+# de ser consistente.
+#: src/lib/util/resolver_api.c:1086
+#, fuzzy
+msgid "Resolver not configured correctly.\n"
+msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
+
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr ""
+"No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
+
+#: src/lib/util/service.c:654
+#, fuzzy, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+"El código de procesado para el mensaje del tipo %u no llamó a "
+"«GNUNET_SERVER_receive_done» después de %s\n"
+
+#: src/lib/util/service.c:838
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr "Familia de direcciones %d desconocida\n"
+
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
+
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
+
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+"¡Se requiere un número de puerto válido para el servicio «%s» en la "
+"configuración!\n"
+
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+"Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
+"«%s», no se pudo crear un «socket» UNIX: %s\n"
+
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+"No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
+"uno es necesario\n"
+
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Se produjo un fallo al resolver «%s»: %s\n"
+
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "No se encontró la dirección %s para «%s».\n"
+
+#: src/lib/util/service.c:1401
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "«%s» falló para el puerto %d (%s).\n"
+
+#: src/lib/util/service.c:1413
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
+
+#: src/lib/util/service.c:1420
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
+
+#: src/lib/util/service.c:1481
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
+
+#: src/lib/util/service.c:1505
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+"No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
+"mismo\n"
+
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr "No existe tal usuario"
+
+#: src/lib/util/service.c:1658
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
+
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
+msgstr "No se pudo inicializar el proceso del servicio\n"
+
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
+msgstr ""
+"No se pudo inicializar la función del servidor en el proceso del servicio\n"
+
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
+msgstr "El proceso del servicio no devolvió un estado\n"
+
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr "demonizar (desasociar del terminal)"
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/lib/util/socks.c:636
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/socks.c:653
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
+
+#: src/lib/util/strings.c:394
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr ""
+"Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
+"establecida"
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr "La dirección IPv6 no empezaba con «[»\n"
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+"La dirección IPv6 contenía «]» antes de «:» para separar el número de "
+"puerto\n"
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+"La dirección IPv6 contenía un número de puerto válido después del último "
+"«:»\n"
+
+#: src/lib/util/strings.c:1081
+#, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Dirección IPv6 «%s» no válida: %s\n"
+
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1283
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Formato no válido para la IP: «%s»\n"
+
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
+
+#: src/lib/util/strings.c:1459
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Formato de tiempo no válido «%s»\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
+
+#: src/lib/util/strings.c:1551
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Formato «%s» erroneo para máscara de red\n"
+
+#: src/lib/util/strings.c:1582
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Formato «%s» erroneo para red\n"
+
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, fuzzy, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+"Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
+"retomar la operación de publicación.\n"
+
+#: src/lib/util/time.c:937
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "No se pudo procesar el registro MX «%s»\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
+#, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "No se pudo procesar el registro MX «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "No se pudo procesar dirección IPv4 «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "Imposible inicializar SQLite: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+#, fuzzy
+msgid "flat plugin running\n"
+msgstr "Base de datos sqlite ejecutándose\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Imposible inicializar SQLite: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
+"Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+msgid "Sqlite database running\n"
+msgstr "Base de datos sqlite ejecutándose\n"
+
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "Base de datos de plantilla ejecutándose\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+#, fuzzy
+msgid "SQlite database running\n"
+msgstr "Base de datos sqlite ejecutándose\n"
+
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+#, fuzzy
+msgid "OpenID Connect REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+#, fuzzy
+msgid "CONFIG REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/service/arm/gnunet-service-arm.c:391
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+"Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
+"fallo al crear un «socket» IPv6: %s\n"
+
+#: src/service/arm/gnunet-service-arm.c:951
+#, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr "Iniciando el servicio «%s»\n"
+
+# Miguel: ¿Alguna idea para "socket"?
+#: src/service/arm/gnunet-service-arm.c:1062
+#, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n"
+
+#: src/service/arm/gnunet-service-arm.c:1093
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+"Imposible asociar el «socket» de escucha para el servicio «%s» a la "
+"dirección «%s»: %s\n"
+
+# Miguel: He traducido "monitor" por gestionar,
+# no es exactamente lo mismo que el texto en inglés, pero
+# es fiel a la realidad puesto que el ARM reinicia
+# las conexiones cuando se caen.
+#: src/service/arm/gnunet-service-arm.c:1124
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
+
+#: src/service/arm/gnunet-service-arm.c:1272
+#, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Preparando para parar «%s»\n"
+
+#: src/service/arm/gnunet-service-arm.c:1604
+#, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Reiniciando el servicio «%s»\n"
+
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr "salida"
+
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr "señal"
+
+#: src/service/arm/gnunet-service-arm.c:1765
+msgid "unknown"
+msgstr "desconocido"
+
+#: src/service/arm/gnunet-service-arm.c:1771
+#, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "El servicio «%s» tardó %s en finalizar\n"
+
+#: src/service/arm/gnunet-service-arm.c:1798
+#, fuzzy, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/core/gnunet-service-core.c:329
+#: src/service/arm/gnunet-service-arm.c:1815
+#, fuzzy, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
+
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr "Iniciando apagado bajo petición del cliente.\n"
+
+#: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core.c:355
+#: src/service/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/service/core/gnunet-service-core.c:419
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:505
+#: src/service/core/gnunet-service-core.c:505
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core.c:824
+#: src/service/core/gnunet-service-core.c:824
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:926
+#: src/service/core/gnunet-service-core.c:926
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:954
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core_kx.c:511
+#: src/service/core/gnunet-service-core_kx.c:511
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:569
+#: src/service/core/gnunet-service-core_kx.c:569
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:666
+#: src/service/core/gnunet-service-core_kx.c:666
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:718
+#: src/service/core/gnunet-service-core_kx.c:718
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:774
+#: src/service/core/gnunet-service-core_kx.c:774
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:806
+#: src/service/core/gnunet-service-core_kx.c:806
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:865
+#: src/service/core/gnunet-service-core_kx.c:865
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/service/core/gnunet-service-core_kx.c:880
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/service/core/gnunet-service-core_kx.c:917
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/service/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:962
+#: src/service/core/gnunet-service-core_kx.c:962
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/service/core/gnunet-service-core_kx.c:1072
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1082
+#: src/service/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1134
+#: src/service/core/gnunet-service-core_kx.c:1134
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/service/core/gnunet-service-core_kx.c:1159
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1172
+#: src/service/core/gnunet-service-core_kx.c:1172
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/service/core/gnunet-service-core_kx.c:1229
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/service/core/gnunet-service-core_kx.c:1237
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1246
+#: src/service/core/gnunet-service-core_kx.c:1246
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/service/core/gnunet-service-core_kx.c:1288
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1331
+#: src/service/core/gnunet-service-core_kx.c:1331
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1343
+#: src/service/core/gnunet-service-core_kx.c:1343
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1352
+#: src/service/core/gnunet-service-core_kx.c:1352
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/service/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/service/core/gnunet-service-core_kx.c:1537
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/service/core/gnunet-service-core_kx.c:1632
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1679
+#: src/service/core/gnunet-service-core_kx.c:1679
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1689
+#: src/service/core/gnunet-service-core_kx.c:1689
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/service/core/gnunet-service-core_sessions.c:285
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:400
+#: src/service/core/gnunet-service-core_sessions.c:400
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/service/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_typemap.c:217
+#: src/service/core/gnunet-service-core_typemap.c:217
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
-#: src/datacache/plugin_datacache_heap.c:492
+#: src/service/datacache/plugin_datacache_heap.c:492
 msgid "Heap datacache running\n"
 msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "«%s» falló en %s: %d con el error: %s\n"
-
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
-"Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
-
-#: src/datastore/datastore_api.c:340
+#: src/service/datastore/datastore_api.c:340
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "Desconectado de"
 
-#: src/datastore/datastore_api.c:462
+#: src/service/datastore/datastore_api.c:462
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "# reconexiones al almacén de datos (DATASTORE)"
 
-#: src/datastore/datastore_api.c:565
+#: src/service/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr "# desbordamientos de la cola"
 
-#: src/datastore/datastore_api.c:595
+#: src/service/datastore/datastore_api.c:595
 msgid "# queue entries created"
 msgstr "# entradas creadas en la cola"
 
-#: src/datastore/datastore_api.c:756
+#: src/service/datastore/datastore_api.c:756
 msgid "# status messages received"
 msgstr "# mensajes de estado recibidos"
 
-#: src/datastore/datastore_api.c:810
+#: src/service/datastore/datastore_api.c:810
 msgid "# Results received"
 msgstr "# Resultados recibidos"
 
-#: src/datastore/datastore_api.c:917
+#: src/service/datastore/datastore_api.c:917
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:1007
+#: src/service/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
 
-#: src/datastore/datastore_api.c:1068
+#: src/service/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1113
+#: src/service/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1171
+#: src/service/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1230
+#: src/service/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1276
+#: src/service/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1357
+#: src/service/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:257
-#, fuzzy, c-format
-msgid "Error queueing datastore GET operation\n"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
-#, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
-#: src/datastore/gnunet-datastore.c:319
-#, fuzzy, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "Se produjo un fallo al abrir «%s» para escritura"
-
-#: src/datastore/gnunet-datastore.c:331
-#, fuzzy, c-format
-msgid "Inserted %<PRIu64> records\n"
-msgstr "establece registros de clase A"
-
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:378
-#, fuzzy, c-format
-msgid "Error queueing datastore PUT operation\n"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "Se produjo un fallo al conectar con el almacén de datos."
-
-#: src/datastore/gnunet-datastore.c:454
-#, fuzzy, c-format
-msgid "Please choose at least one operation: %s, %s\n"
-msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n"
-
-#: src/datastore/gnunet-datastore.c:477
-#, fuzzy
-msgid "Dump all records from the datastore"
-msgstr "Buscar el registro para el nombre dado"
-
-#: src/datastore/gnunet-datastore.c:482
-#, fuzzy
-msgid "Insert records into the datastore"
-msgstr "# bytes mandados al almacén de datos"
-
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:498
-#, fuzzy
-msgid "Manipulate GNUnet datastore"
-msgstr "Manipular ficheros de configuración de GNUnet"
-
-#: src/datastore/gnunet-service-datastore.c:335
+#: src/service/datastore/gnunet-service-datastore.c:335
 msgid "# bytes expired"
 msgstr "# bytes expirados"
 
-#: src/datastore/gnunet-service-datastore.c:419
+#: src/service/datastore/gnunet-service-datastore.c:419
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
-#: src/datastore/gnunet-service-datastore.c:551
+#: src/service/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr "# resultados encontrados"
 
-#: src/datastore/gnunet-service-datastore.c:593
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, fuzzy, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
@@ -1501,7 +4848,7 @@ msgstr ""
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1510,7 +4857,7 @@ msgstr ""
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:612
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1518,66 +4865,66 @@ msgstr ""
 "Espacio insuficiente para satisfacer la petición y la cantidad pedida es "
 "mayor que el tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:619
+#: src/service/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:693
+#: src/service/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:743
+#: src/service/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 "Se necesitan %llu bytes más de espacio (%llu permitidos, usando %llu)\n"
 
-#: src/datastore/gnunet-service-datastore.c:858
+#: src/service/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/service/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:899
+#: src/service/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:940
+#: src/service/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:971
+#: src/service/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1012
+#: src/service/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1019
+#: src/service/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/service/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
@@ -1585,120 +4932,112 @@ msgstr ""
 "El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
 "repararlo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Cargando el módulo del almacén de datos «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/service/datastore/gnunet-service-datastore.c:1176
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/service/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/service/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/service/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/service/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/service/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 "No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 "Se produjo un fallo al borrar el fichero de configuración defectuoso de "
 "«bloomfilter» «%s»:\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/service/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
-#: src/datastore/plugin_datastore_heap.c:895
+#: src/service/datastore/plugin_datastore_heap.c:895
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
+#: src/service/datastore/plugin_datastore_postgres.c:811
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/service/datastore/plugin_datastore_sqlite.c:87
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "«%s» falló en %s:%u con el error: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Imposible inicializar SQLite: %s.\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:634
+#: src/service/datastore/plugin_datastore_sqlite.c:634
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
+#: src/service/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "número de valores"
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1252
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
 #, fuzzy
 msgid "error preparing statement\n"
 msgstr "Error creando el túnel\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
 #, fuzzy
 msgid "error stepping\n"
 msgstr "# elementos almacenados"
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1707,419 +5046,314 @@ msgstr ""
 "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
 "páginas de %llu bytes de tamaño)\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-msgid "Sqlite database running\n"
-msgstr "Base de datos sqlite ejecutándose\n"
-
-#: src/datastore/plugin_datastore_template.c:252
+#: src/service/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
-msgstr ""
-"Resultado %d, tipo %d:\n"
-"%.*s\n"
-
-#: src/dht/gnunet-dht-get.c:167
-#, fuzzy, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-"Resultado %d, tipo %d:\n"
-"%.*s\n"
-
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
-msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
-
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, c-format
-msgid "Failed to connect to DHT service!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
-
-#: src/dht/gnunet-dht-get.c:256
-#, fuzzy
-msgid "Issuing DHT GET with key"
-msgstr "Enviando un «GET» DHT con clave"
-
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
-msgstr "la clave de búsqueda"
-
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
-msgstr "cuantas peticiones paralelas (réplicas) crear"
-
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-#, fuzzy
-msgid "use DHT's record route option"
-msgstr "opción para usar el demultiplexado de la DHT siempre"
-
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
-msgstr "el tipo de datos a buscar"
-
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?"
-
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
-msgstr "opción para usar el demultiplexado de la DHT siempre"
-
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-"Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
-
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
-msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
-
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
-msgstr "ser prolijo (imprime información de progreso)"
-
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
-msgstr "Imprime todos los paquetes que pasan por la DHT."
-
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "¡No se pudo conectar al servicio %s!\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
-
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
-msgstr "los datos a insertar bajo la clave"
-
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
-
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
-msgstr "cuantas réplicas crear"
-
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
-msgstr "el tipo de datos a insertar"
-
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-"Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
-"«KEY»."
-
-#: src/dht/gnunet_dht_profiler.c:925
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-msgid "number of peers to start"
-msgstr "número de pares para empezar"
-
-#: src/dht/gnunet_dht_profiler.c:964
+#: src/service/dht/gnunet_dht_profiler.c:964
 msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 "nombre del fichero con la información de acceso usada para la batería de "
 "pruebas"
 
-#: src/dht/gnunet_dht_profiler.c:976
+#: src/service/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
+#: src/service/dht/gnunet_dht_profiler.c:982
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
+#: src/service/dht/gnunet_dht_profiler.c:988
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
+#: src/service/dht/gnunet_dht_profiler.c:993
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
+#: src/service/dht/gnunet_dht_profiler.c:999
 msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
+#: src/service/dht/gnunet_dht_profiler.c:1005
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
+#: src/service/dht/gnunet_dht_profiler.c:1026
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
 
-#: src/dns/gnunet-dns-monitor.c:387
+#: src/service/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr "Monitorizar consultas DNS."
 
-#: src/dns/gnunet-dns-redirector.c:240
+#: src/service/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr "establece registros de clase A"
 
-#: src/dns/gnunet-dns-redirector.c:246
+#: src/service/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr "establece registros de clase AAAA"
 
-#: src/dns/gnunet-dns-redirector.c:259
+#: src/service/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado."
 
-#: src/dns/gnunet-service-dns.c:463
+#: src/service/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr "# Peticiones DNS contestadas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:617
+#: src/service/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)"
 
-#: src/dns/gnunet-service-dns.c:753
+#: src/service/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:829
+#: src/service/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:951
+#: src/service/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:970
+#: src/service/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n"
 
-#: src/dns/gnunet-service-dns.c:993
+#: src/service/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/service/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1066
+#: src/service/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
-#: src/dns/gnunet-service-dns.c:1125
+#: src/service/dns/gnunet-service-dns.c:1125
 #, fuzzy, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/service/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1074
+#: src/service/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1368
+#: src/service/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1504
+#: src/service/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/service/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1658
+#: src/service/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1749
+#: src/service/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1837
+#: src/service/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:1876
+#: src/service/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2017
+#: src/service/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2287
+#: src/service/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/service/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
 
-#: src/exit/gnunet-daemon-exit.c:2636
+#: src/service/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: src/exit/gnunet-daemon-exit.c:2828
+#: src/service/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2837
+#: src/service/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2913
+#: src/service/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2987
+#: src/service/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:3036
+#: src/service/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:3051
+#: src/service/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:3078
+#: src/service/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/service/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv4 con cabecera «next» no soportada %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/service/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv6 con cabecera «next» no soportada %d.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/service/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Recibido paquete de protocolo desconocido %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/service/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2127,7 +5361,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2135,7 +5369,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/service/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2143,7 +5377,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3661
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2151,100 +5385,102 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3832
+#: src/service/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3948
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, fuzzy, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:4114
+#: src/service/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
-#: src/fs/fs_api.c:481
+#: src/service/fs/fs_api.c:481
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:492
+#: src/service/fs/fs_api.c:492
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:500
+#: src/service/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1157
+#: src/service/fs/fs_api.c:1157
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1708
+#: src/service/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1723
+#: src/service/fs/fs_api.c:1723
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2452
+#: src/service/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2463
+#: src/service/fs/fs_api.c:2463
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2629
+#: src/service/fs/fs_api.c:2629
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2847
+#: src/service/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:3108
+#: src/service/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_directory.c:216
+#: src/service/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "No hay coincidencia con «MAGIC».  Esto no es un directorio GNUnet.\n"
 
-#: src/fs/fs_download.c:311
+#: src/service/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2252,12 +5488,12 @@ msgstr ""
 "Las descargas recursivas de directorios mayores de 4GB no están soportadas "
 "en sistemas de 32 bits\n"
 
-#: src/fs/fs_download.c:333
+#: src/service/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 "Directorio demasiado grande para el espacio de direccionamiento del sistema\n"
 
-#: src/fs/fs_download.c:347
+#: src/service/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
@@ -2265,19 +5501,19 @@ msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
 
-#: src/fs/fs_download.c:961
+#: src/service/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:1045
+#: src/service/fs/fs_download.c:1045
 #, fuzzy, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
@@ -2286,37 +5522,37 @@ msgstr ""
 "Error interno o URI de descarga defectuosa (se esperaban %u bytes a "
 "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
 
-#: src/fs/fs_download.c:1067
+#: src/service/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
 
-#: src/fs/fs_download.c:1090
+#: src/service/fs/fs_download.c:1090
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1101
+#: src/service/fs/fs_download.c:1101
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1111
+#: src/service/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
 "%llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1219
+#: src/service/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1890
+#: src/service/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "URI no válida"
 
-#: src/fs/fs_getopt.c:237
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2325,984 +5561,476 @@ msgstr ""
 "Tipo de metadatos desconocido en la opción de metadatos «%s».  Usando el "
 "tipo de metadatos desconocido (unknown) en su lugar.\n"
 
-#: src/fs/fs_list_indexed.c:191
+#: src/service/fs/fs_list_indexed.c:191
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/fs_misc.c:129
+#: src/service/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "No se encontró el tipo MIME «%s» en la lista de extensiones.\n"
 
-#: src/fs/fs_namespace.c:203
+#: src/service/fs/fs_namespace.c:203
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/fs/fs_namespace.c:234
+#: src/service/fs/fs_namespace.c:234
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:331
+#: src/service/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:458
+#: src/service/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:732
+#: src/service/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Imposible abrir el fichero de configuración '%s'.\n"
 
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:791
+#: src/service/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:837
+#: src/service/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:857
+#: src/service/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:889
+#: src/service/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:915
+#: src/service/fs/fs_publish.c:915
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/service/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:1116
+#: src/service/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:1157
+#: src/service/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1397
+#: src/service/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/fs_publish.c:1489
+#: src/service/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
 
-#: src/fs/fs_publish_ksk.c:213
+#: src/service/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/fs/fs_publish_ublock.c:215
+#: src/service/fs/fs_publish_ublock.c:215
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:994
+#: src/service/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 "Se obtuvo un resultado con un tipo desconocido de bloque «%d», ignorándolo"
 
-#: src/fs/fs_unindex.c:64
+#: src/service/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr "Se produjo un fallo al buscar la posición dada en el fichero"
 
-#: src/fs/fs_unindex.c:69
+#: src/service/fs/fs_unindex.c:69
 msgid "Failed to read file"
 msgstr "No se pudo leer el fichero"
 
 # Miguel: ¿Conectar y conexión?
-#: src/fs/fs_unindex.c:276
+#: src/service/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/fs/fs_unindex.c:327
+#: src/service/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio «FS» para el desindexado."
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr "Se produjo un fallo al obtener KSKs de la búsqueda de directorios."
 
-#: src/fs/fs_unindex.c:386
+#: src/service/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/fs/fs_unindex.c:447
+#: src/service/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Se produjo un fallo al eliminar el KBlock: %s\n"
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
 "(datastore)."
 
-#: src/fs/fs_unindex.c:670
+#: src/service/fs/fs_unindex.c:670
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:709
+#: src/service/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:232
+#: src/service/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:291
+#: src/service/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:309
+#: src/service/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:316
+#: src/service/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:383
+#: src/service/fs/fs_uri.c:383
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:424
+#: src/service/fs/fs_uri.c:424
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:441
+#: src/service/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
+#: src/service/fs/fs_uri.c:518
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:535
+#: src/service/fs/fs_uri.c:535
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:545
+#: src/service/fs/fs_uri.c:545
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:553
+#: src/service/fs/fs_uri.c:553
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:562
+#: src/service/fs/fs_uri.c:562
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:568
+#: src/service/fs/fs_uri.c:568
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:575
+#: src/service/fs/fs_uri.c:575
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:586
+#: src/service/fs/fs_uri.c:586
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:593
+#: src/service/fs/fs_uri.c:593
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:599
+#: src/service/fs/fs_uri.c:599
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:613
+#: src/service/fs/fs_uri.c:613
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:646
+#: src/service/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/fs_uri.c:666
+#: src/service/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1094
+#: src/service/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
-#: src/fs/gnunet-auto-share.c:234
-#, c-format
-msgid "Failed to load state: %s\n"
-msgstr "Se produjo un fallo al cargar el estado: %s\n"
-
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
-#, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "Se produjo un fallo al guardar el estado en el fichero %s\n"
-
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr "Publicación de «%s» finalizada\n"
-
-#: src/fs/gnunet-auto-share.c:480
-#, c-format
-msgid "Publishing `%s'\n"
-msgstr "Publicando «%s»\n"
-
-#: src/fs/gnunet-auto-share.c:491
-#, c-format
-msgid "Failed to run `%s'\n"
-msgstr "Se produjo un fallo al ejecutar «%s»\n"
-
-#: src/fs/gnunet-auto-share.c:661
-#, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
-msgstr ""
-"Debes especificar uno y solo un nombre de directorio para publicación "
-"automática.\n"
-
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
-
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-"deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
-
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
-msgstr "no usar libextractor para añadir palabras clave o metadatos"
-
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
-msgstr "especificar la prioridad del contenido"
-
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
-msgstr "establece el nivel LEVEL deseado de replicación"
-
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
-msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
-
-#: src/fs/gnunet-daemon-fsprofiler.c:668
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Demonio para medir el rendimiento de usar compartición de archivos."
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
-msgstr "\t<fichero original embebido en %u bytes de metadatos>\n"
-
-#: src/fs/gnunet-directory.c:106
-#, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "Metadatos del directorio «%s»:\n"
-
-#: src/fs/gnunet-directory.c:109
-#, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "Contenidos del directorio «%s»:\n"
-
-#: src/fs/gnunet-directory.c:146
-msgid "You must specify a filename to inspect.\n"
-msgstr "Debes especificar un fichero a inspeccionar.\n"
-
-#: src/fs/gnunet-directory.c:160
-#, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Se produjo un fallo al leer el directorio «%s»\n"
-
-#: src/fs/gnunet-directory.c:170
-#, c-format
-msgid "`%s' is not a GNUnet directory\n"
-msgstr "«%s» no es un directorio GNUnet\n"
-
-#: src/fs/gnunet-directory.c:201
-msgid "Display contents of a GNUnet directory"
-msgstr "Muestra los contenidos de un directorio GNUnet"
-
-#: src/fs/gnunet-download.c:131
-#, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/fs/gnunet-download.c:143
-msgid "<unknown time>"
-msgstr "<tiempo desconocido>"
-
-#: src/fs/gnunet-download.c:155
-#, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
-msgstr ""
-"Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en "
-"descargarse\n"
-
-#: src/fs/gnunet-download.c:177
-#, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Error descargando: %s.\n"
-
-#: src/fs/gnunet-download.c:189
-#, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Finalizada descarga «%s» (%s/s).\n"
-
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr "Estado inesperado: %d\n"
-
-#: src/fs/gnunet-download.c:234
-msgid "You need to specify a URI argument.\n"
-msgstr "Tiene que especificar una URI como parámetro.\n"
-
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
-#, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Se produjo un fallo al procesar la URI: %s\n"
-
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
-msgstr "Sólo URI «CHK» o «LOC» soportadas.\n"
-
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
-msgstr "El nombre de fichero de destino debe ser especificado.\n"
-
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "No se pudo inicializar el subsistema «%s».\n"
-
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
-
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
-
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
-msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
-
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
-msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)"
-
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr "establece el número máximo de descargas paralelas permitido"
-
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr "establece el número máximo de peticiones de bloque paralelas permitido"
-
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
-msgstr "descarga un directorio de GNUnet recursivamente"
-
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-"Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
-"chk/...)"
-
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/service/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
 
-#: src/fs/gnunet-fs-profiler.c:218
+#: src/service/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 "especifica el nombre de un fichero con las máquinas (HOSTS) que la batería "
 "de pruebas debería usar"
 
-#: src/fs/gnunet-fs-profiler.c:225
+#: src/service/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr "termina el experimento automáticamente despues de «DELAY»"
 
-#: src/fs/gnunet-fs-profiler.c:237
+#: src/service/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr "imprimir una lista de todos los ficheros indexados"
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr "Operaciones especiales de compartición de ficheros"
-
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
-
-#: src/fs/gnunet-publish.c:247
-#, c-format
-msgid "Error publishing: %s.\n"
-msgstr "Error publicando: %s.\n"
-
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr "Publicación «%s» finalizada.\n"
-
-#: src/fs/gnunet-publish.c:259
-#, c-format
-msgid "URI is `%s'.\n"
-msgstr "La URI es «%s».\n"
-
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr "La URI es «%s».\n"
-
-#: src/fs/gnunet-publish.c:280
-#, fuzzy
-msgid "Starting cleanup after abort\n"
-msgstr "Limpieza completada\n"
-
-#: src/fs/gnunet-publish.c:287
-#, fuzzy
-msgid "Cleanup after abort completed.\n"
-msgstr "Limpieza completada\n"
-
-#: src/fs/gnunet-publish.c:292
-#, fuzzy
-msgid "Cleanup after abort failed.\n"
-msgstr "Limpieza completada\n"
-
-#: src/fs/gnunet-publish.c:426
-#, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "Metadatos para el fichero «%s» (%s)\n"
-
-#: src/fs/gnunet-publish.c:428
-#, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "Palabras clave para el fichero «%s» (%s)\n"
-
-#: src/fs/gnunet-publish.c:583
-msgid "Could not publish\n"
-msgstr "No se pudo publicar\n"
-
-#: src/fs/gnunet-publish.c:612
-msgid "Could not start publishing.\n"
-msgstr "No se pudo empezar a publicar.\n"
-
-#: src/fs/gnunet-publish.c:645
-#, c-format
-msgid "Scanning directory `%s'.\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/fs/gnunet-publish.c:647
-#, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "Escaneando fichero «%s».\n"
-
-#: src/fs/gnunet-publish.c:653
-#, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
-msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
-
-#: src/fs/gnunet-publish.c:659
-msgid "Preprocessing complete.\n"
-msgstr "Preprocesado completo.\n"
-
-#: src/fs/gnunet-publish.c:665
-#, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
-msgstr "Extracción de metadatos del fichero «%s» completa.\n"
-
-#: src/fs/gnunet-publish.c:671
-msgid "Meta data extraction has finished.\n"
-msgstr "La extracción de metadatos ha finalizado.\n"
-
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "Error interno escaneando directorio.\n"
-
-#: src/fs/gnunet-publish.c:706
-#, fuzzy, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr "Espacio de nombres «%s» desconocido.\n"
-
-#: src/fs/gnunet-publish.c:738
-#, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Se produjo un fallo al acceder «%s»: %s\n"
-
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-"Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
-"«gnunet-helper-publish-fs» instalado?\n"
-
-#: src/fs/gnunet-publish.c:811
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr "¡No se pueden extraer metadatos de una URI!\n"
-
-#: src/fs/gnunet-publish.c:818
-#, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
-
-#: src/fs/gnunet-publish.c:824
-#, c-format
-msgid "You must NOT specify an URI and a filename.\n"
-msgstr "No se puede especificar una URI y un nombre de fichero.\n"
-
-#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
-#, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
-msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
-
-#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
-#, 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:907
-#, fuzzy
-msgid "enable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-"deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
-
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-"imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
-"pero sin realizar la subida"
-
-#: src/fs/gnunet-publish.c:921
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
-msgstr ""
-"añadir una palabra 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:928
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
-
-#: src/fs/gnunet-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-"no indexar, hacer inserciones totales (almacena el fichero entero de forma "
-"cifrada en la base de datos de GNUnet)"
-
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
-"especificar la ID de una versión actualizada para ser publicada en el futuro "
-"(para inserciones en el espacio de nombres únicamente)"
-
-#: src/fs/gnunet-publish.c:953
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr ""
-"publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
-"espacio)"
-
-#: src/fs/gnunet-publish.c:965
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
-msgstr ""
-"únicamente simular el proceso pero no publicar nada realmente (útil para "
-"calcular URI)"
-
-#: src/fs/gnunet-publish.c:972
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
-msgstr ""
-"establece la ID de esta versión de la publicación (para inserciones en el "
-"espacio únicamente)"
-
-#: src/fs/gnunet-publish.c:980
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
-msgstr ""
-"URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
-"claves con el fichero con la URI respectiva)"
-
-#: src/fs/gnunet-publish.c:998
-msgid "Publish a file or directory on GNUnet"
-msgstr "Publicar un fichero o un directorio en GNUnet"
-
-#: src/fs/gnunet-search.c:446
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/fs/gnunet-search.c:535
-#, c-format
-msgid "Error searching: %s.\n"
-msgstr "Error buscando: %s.\n"
-
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:602
-#, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:608
-#, c-format
-msgid "An output file is mandatory for silent mode.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:629
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n"
-
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:662
-#, fuzzy, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
-msgstr "No se pudo inicializar el subsistema «%s».\n"
-
-#: src/fs/gnunet-search.c:676
-msgid "Could not start searching.\n"
-msgstr "No se pudo empezar a buscar.\n"
-
-#: src/fs/gnunet-search.c:702
-#, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
-msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
-
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
-msgstr ""
-
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:733
-msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
-msgstr ""
-
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
-msgstr "terminar búsqueda después de «VALUE» resultados encontrados"
-
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
-msgstr ""
-
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
-msgstr ""
-
-#: src/fs/gnunet-search.c:776
-#, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-#, fuzzy
-msgid "Search for files that have been published on GNUnet\n"
-msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
-
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
 
-#: src/fs/gnunet-service-fs.c:423
+#: src/service/fs/gnunet-service-fs.c:423
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:785
+#: src/service/fs/gnunet-service-fs.c:785
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/fs/gnunet-service-fs.c:825
+#: src/service/fs/gnunet-service-fs.c:825
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/service/fs/gnunet-service-fs.c:995
 #, fuzzy, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 "Hash no asociado intentando indexar el fichero «%s» que tiene hash «%s»\n"
 
-#: src/fs/gnunet-service-fs.c:1237
+#: src/service/fs/gnunet-service-fs.c:1237
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# respuestas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# Bloques transferidos vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:539
+#: src/service/fs/gnunet-service-fs_cp.c:539
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:671
+#: src/service/fs/gnunet-service-fs_cp.c:671
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:868
+#: src/service/fs/gnunet-service-fs_cp.c:868
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/service/fs/gnunet-service-fs_cp.c:893
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:903
+#: src/service/fs/gnunet-service-fs_cp.c:903
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1000
+#: src/service/fs/gnunet-service-fs_cp.c:1000
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1058
+#: src/service/fs/gnunet-service-fs_cp.c:1058
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1082
+#: src/service/fs/gnunet-service-fs_cp.c:1082
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1096
+#: src/service/fs/gnunet-service-fs_cp.c:1096
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/service/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1197
+#: src/service/fs/gnunet-service-fs_cp.c:1197
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1541
+#: src/service/fs/gnunet-service-fs_cp.c:1541
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "No se pudo abrir «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/service/fs/gnunet-service-fs_indexing.c:146
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error escribiendo «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/service/fs/gnunet-service-fs_indexing.c:243
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Se produjo un fallo al eliminar el bloque defectuoso: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:296
+#: src/service/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# bloques de índice eliminados: fichero original inaccesible"
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
 "%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/service/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr "no indexado"
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/service/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3311,883 +6039,453 @@ msgstr ""
 "La petición de indexado recibida para el fichero «%s» ya está indexada como "
 "«%s».  Se permite de todos modos.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:260
+#: src/service/fs/gnunet-service-fs_pe.c:260
 msgid "# average retransmission delay (ms)"
 msgstr "# retardo de retransmisión medio (ms)"
 
 # ???
-#: src/fs/gnunet-service-fs_pe.c:422
+#: src/service/fs/gnunet-service-fs_pe.c:422
 #, fuzzy
 msgid "# delay heap timeout (ms)"
 msgstr "# plazo del retraso del montículo"
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/service/fs/gnunet-service-fs_pe.c:433
 msgid "# query plans executed"
 msgstr "# planes de búsqueda ejecutados"
 
-#: src/fs/gnunet-service-fs_pe.c:462
+#: src/service/fs/gnunet-service-fs_pe.c:462
 msgid "# query messages sent to other peers"
 msgstr "# mensajes de búsqueda enviados a otros pares"
 
-#: src/fs/gnunet-service-fs_pe.c:530
+#: src/service/fs/gnunet-service-fs_pe.c:530
 msgid "# requests merged"
 msgstr "# peticiones unidas"
 
-#: src/fs/gnunet-service-fs_pe.c:540
+#: src/service/fs/gnunet-service-fs_pe.c:540
 msgid "# requests refreshed"
 msgstr "# peticiones refrescadas"
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
-#: src/fs/gnunet-service-fs_pr.c:305
+#: src/service/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:795
+#: src/service/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:869
+#: src/service/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/service/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1032
+#: src/service/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1073
+#: src/service/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/service/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/service/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1433
+#: src/service/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1488
+#: src/service/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
 
-#: src/fs/gnunet-service-fs_pr.c:1503
+#: src/service/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
 
-#: src/fs/gnunet-service-fs_pr.c:1526
+#: src/service/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/service/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/service/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1570
+#: src/service/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1616
+#: src/service/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1629
+#: src/service/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/service/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1744
+#: src/service/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/fs/gnunet-service-fs_push.c:643
+#: src/service/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr "Desindexado en %llu/%llu (quedan %s)\n"
-
-#: src/fs/gnunet-unindex.c:103
-#, c-format
-msgid "Error unindexing: %s.\n"
-msgstr "Error desindexando: %s.\n"
-
-#: src/fs/gnunet-unindex.c:109
-msgid "Unindexing done.\n"
-msgstr "Desindexado finalizado.\n"
-
-#: src/fs/gnunet-unindex.c:142
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Se debe especificar uno y solo un fichero para desindexar.\n"
-
-#: src/fs/gnunet-unindex.c:162
-msgid "Could not start unindex operation.\n"
-msgstr "No se pudo empezar la operación de desindexado.\n"
-
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
-msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
-
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
 msgid "metadata length"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
+#: src/service/fs/meta_data.c:1073
 #, fuzzy, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 
-#: src/fs/meta_data.c:1092
+#: src/service/fs/meta_data.c:1092
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Se produjo un fallo al serializar metadatos"
 
-#: src/fs/meta_data.c:1124
+#: src/service/fs/meta_data.c:1124
 #, fuzzy, c-format
 msgid "Serialized %ld bytes of metadata"
 msgstr "\t<fichero original embebido en %u bytes de metadatos>\n"
 
-#: src/fs/meta_data.c:1131
+#: src/service/fs/meta_data.c:1131
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Se produjo un fallo al serializar metadatos"
 
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Error desconocido"
-
-# Miguel: ¿Conectar y conexión?
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Error al comunicar con el servicio ARM.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Contenido no encontrado"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Error desconocido"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# sesiones wlan creadas"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Contenido no encontrado"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "«upnpc» no encontrado\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
-#, fuzzy
-msgid "Zone does not contain any records."
-msgstr "El fichero '%s' no contiene un pseudónimo.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "No se han proporcionado opciones\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "No se han proporcionado opciones\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "No se han proporcionado opciones\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
-#, fuzzy
-msgid "Record already exists."
-msgstr "El registro ya existía en el almacén de nombres"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
-#: src/gns/gns_tld_api.c:292
+#: src/service/gns/gns_tld_api.c:292
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
+#: src/service/gns/gnunet-bcd.c:573
 #, fuzzy, c-format
 msgid "Invalid port number %u\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
 msgid "Unable to set up the daemon\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-bcd.c:660
+#: src/service/gns/gnunet-bcd.c:660
 msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
+#: src/service/gns/gnunet-bcd.c:669
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
+#: src/service/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:377
+#: src/service/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/service/gns/gnunet-dns2gns.c:451
 #, fuzzy, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/service/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/service/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/service/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:839
+#: src/service/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:999
+#: src/service/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:1016
+#: src/service/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns-benchmark.c:582
+#: src/service/gns/gnunet-gns-benchmark.c:582
 msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
+#: src/service/gns/gnunet-gns-benchmark.c:588
 #, fuzzy
 msgid "how long to wait for an answer"
 msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre"
 
-#: src/gns/gnunet-gns-benchmark.c:593
+#: src/service/gns/gnunet-gns-benchmark.c:593
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
+#: src/service/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:979
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/service/gns/gnunet-gns-proxy.c:2654
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/service/gns/gnunet-gns-proxy.c:2686
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/service/gns/gnunet-gns-proxy.c:2895
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/service/gns/gnunet-gns-proxy.c:3268
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/service/gns/gnunet-gns-proxy.c:3300
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3868
+#: src/service/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3873
+#: src/service/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3877
+#: src/service/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
+#: src/service/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "«%s» no es una dirección IP válida.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
-"%s\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr "Buscar el registro para el nombre dado"
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr "Sin salida innecesaria"
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Herramienta de acceso GNUnet GNS"
-
-#: src/gns/gnunet-service-gns.c:518
+#: src/service/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Tipo requerido\n"
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, fuzzy, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, fuzzy, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:900
+#: src/service/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "No se pudo procesar el registro MX «%s»\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:213
-#, fuzzy, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
-msgstr "No se pudo procesar el registro SOA «%s»\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:230
-#, fuzzy, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:254
-#, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-
-#: src/gns/plugin_rest_gns.c:450
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
-#, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, fuzzy, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, fuzzy, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, fuzzy, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "No se pudo procesar el registro SOA «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
-#, fuzzy, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
-msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
-#, fuzzy, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
-#, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "No se pudo procesar el registro MX «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
-#, fuzzy, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "No se pudo procesar el registro SOA «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr ""
-"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
-"de «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
-#, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "No se pudo procesar dirección IPv4 «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
-#, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
-
-#: src/hello/gnunet-hello.c:303
-#, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr "Error accediendo al fichero «%s»: %s\n"
-
-#: src/hello/gnunet-hello.c:310
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
-msgstr "El fichero «%s» es demasiado grande para ser un «HELLO»\n"
-
-#: src/hello/gnunet-hello.c:315
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
-msgstr "El fichero «%s» es demasiado pequeño para ser un «HELLO»\n"
-
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
-#, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "Error abriendo fichero «%s»: %s\n"
-
-#: src/hello/gnunet-hello.c:339
-#, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
-msgstr "No se encontró un «HELLO» bien formado en el fichero «%s»\n"
-
-#: src/hello/gnunet-hello.c:386
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
-msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
-
-#: src/hello/gnunet-hello.c:395
-#, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:409
-#, fuzzy
-msgid "Hello file to read"
-msgstr "fichero pem para usar como autoridad de certificación (CA)"
-
-#: src/hello/gnunet-hello.c:418
-msgid "Print information about peers."
-msgstr "Imprimir información sobre los pares."
-
-#: src/hello/hello.c:1089
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr ""
-"Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
-"expiración\n"
-
-#: src/hello/hello.c:1099
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr ""
-"Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
-"válido\n"
-
-#: src/hello/hello.c:1109
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
-
-#: src/hello/hello.c:1121
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr ""
-"Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
-"transporte\n"
-
-#: src/hello/hello.c:1139
-#, fuzzy, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr "Módulo «%s» no encontrado\n"
-
-#: src/hello/hello.c:1147
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr "El módulo «%s» no soporta URI todavía\n"
-
-#: src/hello/hello.c:1162
-#, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr ""
-"Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
-
-#: src/hostlist/gnunet-daemon-hostlist.c:306
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4195,11 +6493,11 @@ msgstr ""
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4207,47 +6505,47 @@ msgstr ""
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# bytes descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4256,119 +6554,119 @@ msgstr ""
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4376,1965 +6674,807 @@ msgstr ""
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
-#, fuzzy, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
-msgstr ""
-"Error en la comunicación con el servicio de información de pares (PEERINFO): "
-"%s\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-#, fuzzy
-msgid "Expired HELLO encountered (ignored)"
-msgstr "«HELLO» sin dirección encontrados (ignorados)"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 "No se pudo manejar una petición de lista de máquinas debido a que no hay una "
 "respuesta todavía\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, fuzzy, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
+msgstr ""
+"Error en la comunicación con el servicio de información de pares (PEERINFO): "
+"%s\n"
+
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
 #, fuzzy
 msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/identity/gnunet-identity.c:225
-#, fuzzy, c-format
-msgid "Failed to create ego: %s\n"
-msgstr "Se produjo un fallo al crear la página para «%s»\n"
-
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:545
-#, fuzzy
-msgid "delete ego NAME "
-msgstr "borrar un nombre de espacio de nombres (NAME)"
-
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:572
-#, fuzzy
-msgid "display all egos"
-msgstr "mostrar registros"
-
-#: src/identity/gnunet-identity.c:576
-#, fuzzy
-msgid "reduce output"
-msgstr "Sin salida innecesaria"
-
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
-msgstr ""
-
-# Miguel: Aquí he dejado monitorización porque esto es
-# del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:593
-#, fuzzy
-msgid "run in monitor mode egos"
-msgstr "modo de monitorización"
-
-#: src/identity/gnunet-identity.c:597
-msgid "display private keys as well"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
-msgstr ""
-
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/identity/gnunet-service-identity.c:921
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/identity/gnunet-service-identity.c:979
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/identity/gnunet-service-identity.c:988
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/identity/plugin_rest_identity.c:1245
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:105
-#, fuzzy, c-format
-msgid "No records found for `%s'"
-msgstr "No se han encontrado ficheros en «%s»\n"
-
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
-
-#: src/namecache/gnunet-namecache.c:174
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "Se debe especificar un apodo\n"
-
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/namecache/gnunet-namecache.c:187
-#, fuzzy, c-format
-msgid "You must specify a name\n"
-msgstr "¡Debes especificar un receptor!\n"
-
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
-msgstr "nombre del registro a añadir/borrar/mostrar"
-
-#: src/namecache/gnunet-namecache.c:220
-#, fuzzy
-msgid "specifies the public key of the zone to look in"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-msgid "GNUnet zone manipulation tool"
-msgstr "Herramienta de manipulación de zona de GNUnet"
-
-#: src/namecache/namecache_api.c:283
+#: src/service/namecache/namecache_api.c:283
 #, fuzzy
 msgid "Namecache failed to cache block"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
 # Miguel: ¿Conectar y conexión?
-#: src/namecache/namecache_api.c:371
+#: src/service/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "Imposible inicializar SQLite: %s.\n"
-
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Se produjo un fallo al crear los índices\n"
-
-#: src/namecache/plugin_namecache_flat.c:404
-#, fuzzy
-msgid "flat plugin running\n"
-msgstr "Base de datos sqlite ejecutándose\n"
-
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
-#, fuzzy, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr "Argumentos superfluos (ignorados).\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "Herramienta de manipulación de zona de GNUnet"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
 #, fuzzy
 msgid "no errors"
 msgstr "error desconocido"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Creada la entrada '%s' en el espacio '%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
 #, fuzzy
 msgid "unable to store record"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
 #, fuzzy
 msgid "invalid name"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
 #, fuzzy
 msgid "unable to parse key"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
 #, fuzzy
 msgid "No expiration specified for records.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr ""
 "La configuración no especifica «%s», asumiendo el valor predeterminado."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
 #, fuzzy
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "El servicio «%s» no está ejecutandose\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Se produjo un fallo al procesar la URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Se produjo un fallo al procesar la URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Formato del pseudónimo '%s' no es válido.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-#, fuzzy
-msgid "name of the ego controlling the zone"
-msgstr "nombre de la sección a la que acceder"
-
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Comando desconocido «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Formato no válido para la IP: «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr "No se pudo añadir el registro: %s\n"
-
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "No se pudo borrar el registro: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
-msgstr "No se han proporcionado opciones\n"
-
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "Falta la opción «%s» para la operación «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1381
-#, fuzzy
-msgid "name"
-msgstr "sin nombre"
-
-#: src/namestore/gnunet-namestore.c:1410
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "URI no válida: «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr "añadir"
-
-#: src/namestore/gnunet-namestore.c:1461
-#, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Tipo no soportado «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1471
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1491
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "Formato de tiempo no válido «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr "borrar"
-
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1642
-#, fuzzy, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1679
-#, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "URI no válida: «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1967
-#, fuzzy, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "¡No se pudo conectar al servicio %s!\n"
-
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr "añadir registro"
-
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr "borrar registro"
-
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr "mostrar registros"
-
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
-"tiempo de expiración del registro a usar (únicamente para añadir), nunca "
-"(\"never\") es posible"
-
-#: src/namestore/gnunet-namestore.c:2010
-#, fuzzy
-msgid "set the desired nick name for the zone"
-msgstr "establece el nivel LEVEL deseado de replicación"
-
-#: src/namestore/gnunet-namestore.c:2015
-#, fuzzy
-msgid "monitor changes in the namestore"
-msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
-
-#: src/namestore/gnunet-namestore.c:2025
-#, fuzzy
-msgid "Output in recordline format"
-msgstr "salida en formato de gnuplot"
-
-#: src/namestore/gnunet-namestore.c:2031
-#, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "establece las preferencias para el par dado"
-
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
-msgstr "tipo del registro a añadir/borrar/mostrar"
-
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
-msgstr "URI a importar a nuestra zona"
-
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
-msgstr "valor del registro a añadir/borrar"
-
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
-msgstr "crear o listar registros públicos"
-
-#: src/namestore/gnunet-namestore.c:2056
-#, fuzzy
-msgid "omit private records"
-msgstr "mostrar registros"
-
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:792
-#, fuzzy
-msgid "Flat file database running\n"
-msgstr "Base de datos de plantilla ejecutándose\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:956
-#, fuzzy
-msgid "SQlite database running\n"
-msgstr "Base de datos sqlite ejecutándose\n"
-
-#: src/namestore/plugin_rest_namestore.c:1320
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:189
-#, fuzzy
-msgid "Suggested configuration changes:\n"
-msgstr "Configuración de GNUnet"
-
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Se produjo un fallo al guardar la nueva configuración al disco"
-
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, fuzzy, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr "No se pudo acceder al fichero de configuración «%s»\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:327
-#, fuzzy
-msgid "run autoconfiguration"
-msgstr "Configuración de GNUnet"
-
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-#, fuzzy
-msgid "write configuration file (for autoconfiguration)"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:355
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 "Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
+#: src/service/nat-auto/nat_auto_api.c:73
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/service/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
+#: src/service/nat-auto/nat_auto_api.c:79
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/service/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
+#: src/service/nat-auto/nat_auto_api.c:85
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/service/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat-auto/nat_auto_api.c:91
+#: src/service/nat-auto/nat_auto_api.c:91
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/service/nat-auto/nat_auto_api.c:94
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat-auto/nat_auto_api.c:97
+#: src/service/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/service/nat-auto/nat_auto_api.c:100
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat-auto/nat_auto_api.c:103
+#: src/service/nat-auto/nat_auto_api.c:103
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/service/nat-auto/nat_auto_api.c:106
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat-auto/nat_auto_api.c:109
+#: src/service/nat-auto/nat_auto_api.c:109
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
+#: src/service/nat-auto/nat_auto_api.c:113
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/nat-auto/nat_auto_api.c:116
+#: src/service/nat-auto/nat_auto_api.c:116
 #, fuzzy
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat-auto/nat_auto_api.c:119
+#: src/service/nat-auto/nat_auto_api.c:119
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
+#: src/service/nat-auto/nat_auto_api.c:122
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
+#: src/service/nat-auto/nat_auto_api.c:125
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
+#: src/service/nat-auto/nat_auto_api.c:128
 #, fuzzy
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "¡Se produjo un fallo al buscar la opción %s en la sección %s!\n"
 
-#: src/nat-auto/nat_auto_api_test.c:489
+#: src/service/nat-auto/nat_auto_api_test.c:489
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:453
-#, fuzzy
-msgid "watch for connection reversal requests"
-msgstr "# pares desconectados debido a petición externa"
-
-#: src/nat/gnunet-nat.c:464
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
-
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/nat/gnunet-service-nat.c:1362
 #, fuzzy, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 "Puerto inválido \"%s\" en la especificación de la lista local, probando el "
 "puerto %d.\n"
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1861
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Colección detenida.\n"
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1935
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n"
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/gnunet-service-nat_mini.c:188
+#: src/service/nat/gnunet-service-nat_mini.c:188
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/gnunet-service-nat_mini.c:602
+#: src/service/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/service/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
 
-#: src/nse/gnunet-nse-profiler.c:864
+#: src/service/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:879
+#: src/service/nse/gnunet-nse-profiler.c:879
 msgid "name of the file for writing the main results"
 msgstr "nombre del fichero en el que escribir los resultados principales"
 
-#: src/nse/gnunet-nse-profiler.c:888
+#: src/service/nse/gnunet-nse-profiler.c:888
 msgid "Number of peers to run in each round, separated by commas"
 msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/service/nse/gnunet-nse-profiler.c:900
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:912
+#: src/service/nse/gnunet-nse-profiler.c:912
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-nse.c:124
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# Estimaciones del tamaño de red recibidas"
-
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/service/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:657
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:688
+#: src/service/peerstore/gnunet-service-peerstore.c:692
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-#: src/peerstore/peerstore_api.c:781
+#: src/service/peerstore/peerstore_api.c:781
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/peerstore_api.c:895
+#: src/service/peerstore/peerstore_api.c:895
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/pt/gnunet-daemon-pt.c:416
+#: src/service/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:422
+#: src/service/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
 
-#: src/pt/gnunet-daemon-pt.c:476
+#: src/service/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
 
-#: src/pt/gnunet-daemon-pt.c:671
+#: src/service/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:678
+#: src/service/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/service/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:771
+#: src/service/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:777
+#: src/service/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
-#: src/pt/gnunet-daemon-pt.c:786
+#: src/service/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/service/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:898
+#: src/service/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Se produjo un fallo al conectar con el servicio %s.  Saliendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:1314
+#: src/service/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:805
-#, fuzzy, c-format
-msgid "Ego is required\n"
-msgstr "Las opción «%s» o «%s» es necesaria.\n"
-
-#: src/reclaim/gnunet-reclaim.c:812
-#, c-format
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:819
-#, fuzzy, c-format
-msgid "Requesting party key is required!\n"
-msgstr "el parámetro --section es necesario\n"
-
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:852
-#, fuzzy
-msgid "The EGO to use"
-msgstr "tamaño del mensaje"
-
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
-msgstr ""
-
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-#, fuzzy
-msgid "OpenID Connect REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/reclaim/reclaim_api.c:544
+#: src/service/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
 "El servicio %s carece de opciones de configuración de clave (%s).  "
 "Saliendo.\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
 #, fuzzy
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1365
+#: src/service/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1421
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/service/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1450
+#: src/service/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1539
+#: src/service/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1546
+#: src/service/regex/gnunet-regex-profiler.c:1546
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1552
+#: src/service/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
+#: src/service/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1566
+#: src/service/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1581
+#: src/service/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr "nombre de la tabla para escribir los DFA"
 
 # WTF???
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
-#: src/regex/regex_api_announce.c:151
+#: src/service/regex/regex_api_announce.c:151
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/regex/regex_api_search.c:200
+#: src/service/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:1369
+#: src/service/rest/gnunet-rest-server.c:1369
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/rest/plugin_rest_config.c:428
-#, fuzzy
-msgid "CONFIG REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/rest/plugin_rest_copying.c:211
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/revocation/gnunet-revocation.c:146
-#, fuzzy, c-format
-msgid "Key `%s' is valid\n"
-msgstr "Formato del pseudónimo '%s' no es válido.\n"
-
-# Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
-# Esto también es aplicable a las siguientes traducciones.
-#: src/revocation/gnunet-revocation.c:150
-#, fuzzy, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr "El servicio «%s» se ha parado.\n"
-
-#: src/revocation/gnunet-revocation.c:154
-#, fuzzy
-msgid "Internal error\n"
-msgstr "Error interno."
-
-#: src/revocation/gnunet-revocation.c:180
-#, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:183
-#, fuzzy
-msgid "Revocation failed (!)\n"
-msgstr "La operación ha fallado.\n"
-
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:334
-#, fuzzy, c-format
-msgid "Ego `%s' not found.\n"
-msgstr "Módulo «%s» no encontrado\n"
-
-#: src/revocation/gnunet-revocation.c:350
-#, fuzzy, c-format
-msgid "Error: Key is invalid\n"
-msgstr "Formato del pseudónimo '%s' no es válido.\n"
-
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:424
-#, fuzzy, c-format
-msgid "Public key `%s' malformed\n"
-msgstr "El bloque del tipo %u está mal formado\n"
-
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:464
-#, fuzzy
-msgid "No filename to store revocation certificate given.\n"
-msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
-
-#: src/revocation/gnunet-revocation.c:481
-#, fuzzy, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
-msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
-
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
-
-#: src/revocation/gnunet-revocation.c:511
-#, fuzzy
-msgid "No action specified. Nothing to do.\n"
-msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
-
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:558
-#, fuzzy
-msgid "number of epochs to calculate for"
-msgstr "número de pares para empezar"
-
-#: src/revocation/gnunet-service-revocation.c:539
+#: src/service/revocation/gnunet-service-revocation.c:539
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/revocation/gnunet-service-revocation.c:549
+#: src/service/revocation/gnunet-service-revocation.c:549
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
+#: src/service/revocation/gnunet-service-revocation.c:558
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/revocation/gnunet-service-revocation.c:566
+#: src/service/revocation/gnunet-service-revocation.c:566
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/revocation/gnunet-service-revocation.c:604
+#: src/service/revocation/gnunet-service-revocation.c:604
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
+#: src/service/revocation/gnunet-service-revocation.c:959
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps-profiler.c:3142
-#, fuzzy
-msgid "duration of the profiling"
-msgstr ""
-"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
-
-#: src/rps/gnunet-rps-profiler.c:3148
-#, fuzzy
-msgid "timeout for the profiling"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/rps/gnunet-rps-profiler.c:3153
-#, fuzzy
-msgid "number of PeerIDs to request"
-msgstr "número de pares para empezar"
-
-#: src/rps/gnunet-rps-profiler.c:3170
-#, fuzzy
-msgid "Measure quality and performance of the RPS service."
-msgstr "Medir la calidad y rendimiento del servicio NSE."
-
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-#, fuzzy
-msgid "You must specify at least one message ID to check!\n"
-msgstr "Debes especificar un fichero a inspeccionar.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, fuzzy, c-format
-msgid "Malformed input, could not parse `%s'\n"
-msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "No se pudo conectar al servicio %s.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-#, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr "Conexión fallida (¿bug?)\n"
-
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-msgid "number of peers in consensus"
-msgstr "número de pares en consenso"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "¡No se pudo conectar al servicio %s!\n"
-
-# Miguel: Conjunto resta.
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-msgid "number of element in set A-B"
-msgstr "número de elementos en el conjunto A-B"
-
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-msgid "number of element in set B-A"
-msgstr "número de elementos en el conjunto B-A"
-
-# Miguel: Conjunto unión.
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
-msgstr "número de elementos comunes en A y B"
-
-# Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr "número de hash"
-
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr "tamaño ibf"
-
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-msgid "number of values"
-msgstr "número de valores"
-
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-#, fuzzy
-msgid "write statistics to file"
-msgstr "imprime el valor de las estadísticas"
-
-#: src/seti/gnunet-seti-profiler.c:457
+#: src/service/seti/gnunet-seti-profiler.c:457
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
-msgstr ""
-
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
-msgstr ""
-
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-msgid "Failed to obtain statistics.\n"
-msgstr "Se produjo un fallo al obtener las estadísticas.\n"
-
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr ""
-"Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
-
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
-msgstr "Falta el parámetro: subsistema\n"
-
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
-msgstr "Falta el argumento: nombre\n"
-
-#: src/statistics/gnunet-statistics.c:577
-#, c-format
-msgid "No subsystem or name given\n"
-msgstr "No se proporcionó un subsistema o un nombre\n"
-
-#: src/statistics/gnunet-statistics.c:589
-#, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
-
-#: src/statistics/gnunet-statistics.c:725
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:742
-#, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:751
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:783
-#, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
-msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
-
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr "hacer el valor persistente"
-
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
-msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
-
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
-msgstr "imprime el valor de las estadísticas"
-
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
-msgstr "visualiza el valor continuamente"
-
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
-msgstr "conectar a equipo remoto"
-
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
-msgstr "puerto del equipo remoto"
-
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
-
-#: src/statistics/statistics_api.c:749
+#: src/service/statistics/statistics_api.c:749
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/testing/gnunet-testing.c:185
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
 "grande?)\n"
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n"
 
-#: src/testing/gnunet-testing.c:386
+#: src/service/testing/gnunet-testing.c:386
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/testing/gnunet-testing.c:392
+#: src/service/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 "extraer los ficheros de claves de máquinas de una lista pre-computada de "
 "claves de máquinas"
 
-#: src/testing/gnunet-testing.c:400
+#: src/service/testing/gnunet-testing.c:400
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -6342,43 +7482,37 @@ msgstr ""
 "número de ficheros de configuración únicos o claves de máquina a crear, o el "
 "número de claves de máquina a extraer"
 
-#: src/testing/gnunet-testing.c:407
+#: src/service/testing/gnunet-testing.c:407
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/testing/gnunet-testing.c:415
+#: src/service/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
+#: src/service/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
-
-#: src/testing/list-keys.c:92
+#: src/service/testing/list-keys.c:92
 #, fuzzy
 msgid "list COUNT number of keys"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testing/testing.c:291
+#: src/service/testing/testing.c:291
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:743
+#: src/service/testing/testing.c:743
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1217
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -6387,169 +7521,169 @@ msgstr ""
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:1226
+#: src/service/testing/testing.c:1226
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:1236
+#: src/service/testing/testing.c:1236
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
 
-#: src/testing/testing.c:1249
+#: src/service/testing/testing.c:1249
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Se produjo un fallo al crear la configuración para el par (¿no hay "
 "suficientes puertos libres?)\n"
 
-#: src/testing/testing.c:1265
+#: src/service/testing/testing.c:1265
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
 
-#: src/testing/testing.c:1279
+#: src/service/testing/testing.c:1279
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:1307
+#: src/service/testing/testing.c:1307
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1413
+#: src/service/testing/testing.c:1413
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1664
+#: src/service/testing/testing.c:1664
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/testing/testing.c:2795
+#: src/service/testing/testing.c:2795
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testing/testing.c:2803
+#: src/service/testing/testing.c:2803
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testing/testing.c:2811
+#: src/service/testing/testing.c:2811
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/topology/gnunet-daemon-topology.c:257
+#: src/service/topology/gnunet-daemon-topology.c:257
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:451
+#: src/service/topology/gnunet-daemon-topology.c:451
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:805
+#: src/service/topology/gnunet-daemon-topology.c:805
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:870
+#: src/service/topology/gnunet-daemon-topology.c:870
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/service/topology/gnunet-daemon-topology.c:1005
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-communicator-quic.c:1787
+#: src/service/transport/gnunet-communicator-quic.c:1787
 #, fuzzy
 msgid "GNUnet QUIC communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-tcp.c:4071
+#: src/service/transport/gnunet-communicator-tcp.c:4071
 #, fuzzy
 msgid "GNUnet TCP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-udp.c:3433
+#: src/service/transport/gnunet-communicator-udp.c:3433
 #, fuzzy
 msgid "GNUnet UDP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-unix.c:788
+#: src/service/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1015
+#: src/service/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-communicator-unix.c:1138
+#: src/service/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/transport/gnunet-transport.c:415
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/transport/gnunet-transport.c:454
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/transport/gnunet-transport.c:466
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:477
+#: src/service/transport/gnunet-transport.c:477
 #, fuzzy
 msgid "Failed to list connections, timeout occurred\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/transport/gnunet-transport.c:504
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:537
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -6558,46 +7692,47 @@ msgstr ""
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/transport/gnunet-transport.c:566
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/transport/gnunet-transport.c:592
+#: src/service/transport/gnunet-transport.c:592
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:621
+#: src/service/transport/gnunet-transport.c:621
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/transport/gnunet-transport.c:654
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/transport/gnunet-transport.c:701
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1103
+#: src/service/transport/gnunet-transport.c:1103
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/transport/gnunet-transport.c:1199
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -6606,7 +7741,7 @@ msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/transport/gnunet-transport.c:1214
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -6614,1257 +7749,207 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1242
+#: src/service/transport/gnunet-transport.c:1242
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1248
+#: src/service/transport/gnunet-transport.c:1248
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1301
+#: src/service/transport/gnunet-transport.c:1301
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1367
+#: src/service/transport/gnunet-transport.c:1367
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/transport/gnunet-transport.c:1373
+#: src/service/transport/gnunet-transport.c:1373
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1377
+#: src/service/transport/gnunet-transport.c:1377
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1383
+#: src/service/transport/gnunet-transport.c:1383
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/transport/gnunet-transport.c:1395
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1399
+#: src/service/transport/gnunet-transport.c:1399
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1404
+#: src/service/transport/gnunet-transport.c:1404
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1408
+#: src/service/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:1414
+#: src/service/transport/gnunet-transport.c:1414
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/service/transport/gnunet-transport.c:1426
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/transport/transport_api2_communication.c:761
+#: src/service/transport/transport_api2_communication.c:761
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Error leyendo «%s»: %s"
-
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr "Fin del fichero"
-
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Error decodificando clave %u\n"
-
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
-
-#: src/util/bio.c:312
-#, fuzzy, c-format
-msgid "Invalid handle type while reading `%s'"
-msgstr "Parámetro no válido «%s» en la línea de comandos\n"
-
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
-msgstr ""
-
-#: src/util/bio.c:345
-#, fuzzy, c-format
-msgid "%s (while reading `%s')"
-msgstr "Error decodificando clave %u\n"
-
-#: src/util/bio.c:350
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr "Se produjo un error leyendo la cadena «%s»"
-
-#: src/util/bio.c:363
-#, fuzzy, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
-msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
-
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Error decodificando clave %u\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
-
-#: src/util/bio.c:773
-#, fuzzy, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr "Formato de tiempo no válido «%s»\n"
-
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
-msgstr ""
-
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
-msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
-
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:910
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
-
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "ERROR"
-
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "PELIGRO"
-
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
-msgstr "MENSAJE"
-
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "INFORMACIÓN"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "DEPURACIÓN"
-
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr "NINGUNO"
-
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr "NO VÁLIDO"
-
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr "dirección desconocida"
-
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr "dirección no válida"
-
-#: src/util/common_logging.c:1416
-#, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
-
-#: src/util/common_logging.c:1431
-#, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
-msgstr ""
-"La configuración especifica un valor no válido en la opción «%s» de la "
-"sección «%s»: %s\n"
-
-#: src/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/util/configuration.c:1718
-#, fuzzy
-msgid "Not a valid relative time specification"
-msgstr "Tiempo de expiración no válido para la operación «%s»\n"
-
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
-"El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
-"de las opciones legales\n"
-
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:148
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "el parámetro --section es necesario\n"
-
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr "el parámetro --option es necesario para establecer un valor\n"
-
-#: src/util/configuration_helper.c:263
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
-"El tamaño del fichero en disco es incorrecto para este «Bloom "
-"filter» (esperado %llu, tiene %llu)\n"
-
-#: src/util/crypto_ecc.c:554
-#, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "El firmado ECC falló en %s:%d: %s\n"
-
-#: src/util/crypto_ecc.c:677
-#, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
-
-#: src/util/crypto_ecc_setup.c:282
-#, fuzzy
-msgid "Could not load peer's private key\n"
-msgstr "No se pudo acceder a la clave de máquina.\n"
-
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
-
-#: src/util/crypto_rsa.c:908
-#, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "El firmado ECC falló en %s:%d: %s\n"
-
-#: src/util/crypto_rsa.c:1208
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
-
-#: src/util/disk.c:843
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
-
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
-
-#: src/util/dnsparser.c:910
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr ""
-"Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
-"IDNA: %s\n"
-
-#: src/util/dnsstub.c:228
-#, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "No se pudo asociar con ningún puerto: %s\n"
-
-#: src/util/dnsstub.c:371
-#, fuzzy, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
-msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
-
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
-
-#: src/util/dnsstub.c:509
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "Petición DNS enviada a %s\n"
-
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: la opción «%s» es ambigua\n"
-
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: la opción «--%s» no permite un parámetro\n"
-
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: la opción «%c%s» no permite un parámetro\n"
-
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: la opción «%s» requiere un parámetro\n"
-
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opción no reconocida «--%s»\n"
-
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opción no reconocida «%c%s»\n"
-
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
-
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opción no válida -- %c\n"
-
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: la opción requiere un parámetro -- %c\n"
-
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: la opción «-W %s» es ambigua\n"
-
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: la opción «-W %s» no permite un parámetro\n"
-
-#: src/util/getopt.c:971
-#, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Use %s para obtener una lista de opciones.\n"
-
-#: src/util/getopt.c:984
-#, fuzzy, c-format
-msgid "Option `%s' can't be used with other options.\n"
-msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
-
-#: src/util/getopt.c:996
-#, fuzzy, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr "Falta la opción «%s» para la operación «%s»\n"
-
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
-msgstr "imprime el número de versión"
-
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Los parámetros obligatorios para las opciones largas también lo son para sus "
-"versiones cortas.\n"
-
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
-msgstr "imprime esta ayuda"
-
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
-msgstr ""
-
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
-
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:463
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "crear ficheros de configuración únicos"
-
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Tienes que introducir un número en la opción «%s».\n"
-
-#: src/util/getopt_helpers.c:571
-#, fuzzy, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
-msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
-
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
-msgstr ""
-
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
-msgstr ""
-
-#: src/util/getopt_helpers.c:632
-#, c-format
-msgid "You must pass relative time to the `%s' option.\n"
-msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
-
-#: src/util/getopt_helpers.c:686
-#, fuzzy, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
-
-#: src/util/getopt_helpers.c:743
-#, fuzzy, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
-msgstr "Tienes que introducir un número en la opción «%s».\n"
-
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:806
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:876
-#, fuzzy, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr "Tienes que introducir un número en la opción «%s».\n"
-
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
-msgstr ""
-
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
-msgstr ""
-
-#: src/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
-msgstr "Manipular ficheros de configuración de GNUnet"
-
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:95
-#, c-format
-msgid "Failed to open `%s': %s\n"
-msgstr "Se produjo un fallo al abrir «%s»: %s\n"
-
-#: src/util/gnunet-ecc.c:129
-#, fuzzy, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr "Generando %u claves, por favor, espere"
-
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
-msgstr "Generando %u claves, por favor, espere"
-
-#: src/util/gnunet-ecc.c:178
-#, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
-msgstr ""
-"\n"
-"Se produjo un fallo al escribir en «%s»: %s\n"
-
-#: src/util/gnunet-ecc.c:185
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Finished!\n"
-msgstr "¡Finalizado!\n"
-
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:304
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' not found\n"
-msgstr "El fichero de máquinas %s no fue encontrado\n"
-
-#: src/util/gnunet-ecc.c:314
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' is empty\n"
-msgstr "El archivo de amigos «%s» está vacío.\n"
-
-#: src/util/gnunet-ecc.c:334
-#, fuzzy, c-format
-msgid "Could not read hostkey file: %s\n"
-msgstr "¡No se puede leer el fichero de claves de máquina!\n"
-
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
-
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
-msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
-
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
-msgstr "imprime la clave pública en formato ASCII"
-
-#: src/util/gnunet-ecc.c:474
-#, fuzzy
-msgid "print the private key in ASCII format"
-msgstr "imprime la clave pública en formato ASCII"
-
-#: src/util/gnunet-ecc.c:479
-#, fuzzy
-msgid "print the public key in HEX format"
-msgstr "imprime la clave pública en formato ASCII"
-
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:499
-msgid "Manipulate GNUnet private ECC key files"
-msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
-
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Se produjo un fallo al procesar la URI: %s\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "URI no válida: «%s»\n"
-
-#: src/util/gnunet-qr.c:161
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
-msgstr "URI no válida: no comienza con «%s»\n"
-
-#: src/util/gnunet-qr.c:171
-#, fuzzy, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
-msgstr "URI no válida: falla al especificar el subsistema\n"
-
-#: src/util/gnunet-qr.c:182
-#, fuzzy, c-format
-msgid "No known handler for subsystem `%s'\n"
-msgstr "No hay un manejador conocido para el subsistema «%s»\n"
-
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "Se produjo un fallo al iniciar el proceso «ssh».\n"
-
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "Se produjo un fallo al abrir «%s»: %s\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
-#, c-format
-msgid "Got %d images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
-#, fuzzy, c-format
-msgid "Found %s: \"%s\"\n"
-msgstr "Yo soy el par '%s'.\n"
-
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "«%s» no es un directorio GNUnet\n"
-
-#: src/util/gnunet-qr.c:546
-#, fuzzy
-msgid "No data found\n"
-msgstr "«upnpc» no encontrado\n"
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
-msgstr ""
-
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
-msgstr ""
-
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
-msgstr "realizar una búsqueda inversa"
-
-#: src/util/gnunet-resolver.c:183
-#, fuzzy
-msgid "Use built-in GNUnet stub resolver"
-msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
-
-#: src/util/gnunet-scrypt.c:215
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
-
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:313
-#, fuzzy
-msgid "Manipulate GNUnet proof of work files"
-msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
-
-#: src/util/gnunet-service-resolver.c:1288
+#: src/service/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
-msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n"
-
-#: src/util/gnunet-uri.c:95
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "URI no válida: no comienza con «%s»\n"
-
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr "URI no válida: falla al especificar el subsistema\n"
-
-#: src/util/gnunet-uri.c:109
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr "No hay un manejador conocido para el subsistema «%s»\n"
-
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
-msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
-
-#: src/util/helper.c:304
-#, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "Error leyendo de «%s»: %s\n"
-
-#: src/util/helper.c:356
-#, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr ""
-"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
-"«%s»\n"
-
-#: src/util/helper.c:571
-#, c-format
-msgid "Error writing to `%s': %s\n"
-msgstr "Error escribiendo a «%s»: %s\n"
-
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
-msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
-
-#: src/util/network.c:1284
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
-"¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
-"CTRL-C)!\n"
-
-#: src/util/os_installation.c:416
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr ""
-"No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
-"de entorno «%s».\n"
-
-#: src/util/os_installation.c:787
-#, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
-
-#: src/util/os_installation.c:820
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
-
-#: src/util/plugin.c:158
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "«%s» falló al resolver el método «%s» con error: %s\n"
-
-#: src/util/plugin.c:215
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
-
-#: src/util/plugin.c:371
-msgid "Could not determine plugin installation path.\n"
-msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
-
-#: src/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/util/regex.c:123
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:243
-#, fuzzy, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
-msgstr ""
-"¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
-"la configuración!\n"
-
-#: src/util/resolver_api.c:888
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
-
-# Miguel: He traducido "default" por "predeterminado", la locución
-# "por defecto" no tiene sentido en sitios como este y he tratado
-# de ser consistente.
-#: src/util/resolver_api.c:1086
-#, fuzzy
-msgid "Resolver not configured correctly.\n"
-msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
-
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr ""
-"No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
-
-#: src/util/service.c:654
-#, fuzzy, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
-msgstr ""
-"El código de procesado para el mensaje del tipo %u no llamó a "
-"«GNUNET_SERVER_receive_done» después de %s\n"
-
-#: src/util/service.c:838
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr "Familia de direcciones %d desconocida\n"
-
-#: src/util/service.c:951
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
-
-#: src/util/service.c:992
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
-
-#: src/util/service.c:1401
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "«%s» falló para el puerto %d (%s).\n"
-
-#: src/util/service.c:1413
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
-
-#: src/util/service.c:1420
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
-
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
-
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-"No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
-"mismo\n"
-
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr "No existe tal usuario"
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
-
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
-msgstr "No se pudo inicializar el proceso del servicio\n"
-
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
-msgstr ""
-"No se pudo inicializar la función del servidor en el proceso del servicio\n"
-
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
-msgstr "El proceso del servicio no devolvió un estado\n"
-
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
-msgstr "demonizar (desasociar del terminal)"
-
-#: src/util/service.c:2099
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
-msgstr ""
-
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
-msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
-
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-"Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
-"establecida"
-
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
-msgstr "La dirección IPv6 no empezaba con «[»\n"
-
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
-msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
-
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr ""
-"La dirección IPv6 contenía «]» antes de «:» para separar el número de "
-"puerto\n"
-
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr ""
-"La dirección IPv6 contenía un número de puerto válido después del último "
-"«:»\n"
-
-#: src/util/strings.c:1081
-#, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "Dirección IPv6 «%s» no válida: %s\n"
-
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
-msgstr ""
-
-#: src/util/strings.c:1283
-#, fuzzy, c-format
-msgid "Malformed port policy `%s'\n"
-msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
-
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Formato no válido para la IP: «%s»\n"
-
-#: src/util/strings.c:1408
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
-
-#: src/util/strings.c:1459
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Formato de tiempo no válido «%s»\n"
-
-#: src/util/strings.c:1501
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
-
-#: src/util/strings.c:1551
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Formato «%s» erroneo para máscara de red\n"
-
-#: src/util/strings.c:1582
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Formato «%s» erroneo para red\n"
-
-#: src/util/time.c:901 src/util/time.c:929
-#, fuzzy, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-"Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
-"retomar la operación de publicación.\n"
-
-#: src/util/time.c:937
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 #, fuzzy
 msgid "# Active channels"
 msgstr "# Túneles activos"
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# Túneles mesh creados"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Paquete recibido para el destino «%s» no mapeado (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv6 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
 
-#: src/vpn/gnunet-vpn.c:142
-msgid "Error creating tunnel\n"
-msgstr "Error creando el túnel\n"
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr "La opción «%s» no tiene sentido con la opción «%s».\n"
-
-#: src/vpn/gnunet-vpn.c:202
-#, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "Las opción «%s» o «%s» es necesaria.\n"
-
-#: src/vpn/gnunet-vpn.c:216
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n"
-
-#: src/vpn/gnunet-vpn.c:239
-#, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "«%s» no es un identificador de par válido\n"
-
-#: src/vpn/gnunet-vpn.c:258
-#, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "«%s» no es una dirección IP válida.\n"
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr "petición cuyo resultado debe ser una dirección IPv4"
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr "petición cuyo resultado debe ser una dirección IPv6"
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?"
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr "IP de destino para el túnel"
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr "par que ofrece el servicio al que nos gustaría acceder"
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr "nombre del servicio al que nos gustaría acceder"
-
-#: src/vpn/gnunet-vpn.c:334
-msgid "service is offered via TCP"
-msgstr "el servicio es ofrecido vía TCP"
-
-#: src/vpn/gnunet-vpn.c:339
-msgid "service is offered via UDP"
-msgstr "el servicio es ofrecido vía UDP"
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr "Configurar túneles vía VPN."
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
 #, fuzzy
+#~ msgid "Expired HELLO encountered (ignored)"
+#~ msgstr "«HELLO» sin dirección encontrados (ignorados)"
+
+#, fuzzy
 #~ msgid ""
 #~ "how many peers (random selection without replacement) receive one value?"
 #~ msgstr "¿cuántos pares reciben un valor?"
diff --git a/po/fr.po b/po/fr.po
index 045f55ad2..298885183 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -17,7327 +17,7409 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, c-format
-msgid "Failed to connect to namestore\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:566
-msgid "Ego does not exist!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, c-format
-msgid "ego required\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-msgid "The public key of the authority to verify the credential against"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1030
-msgid "The ego/zone name to use"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-msgid "GNUnet abd resolver tool"
-msgstr ""
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr ""
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 #, fuzzy
 msgid "is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 msgid "(No services configured.)\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
 #, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/cadet/gnunet-cadet.c:685
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/cadet/gnunet-cadet.c:746
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
-#, c-format
-msgid "Using `%s' instead\n"
+#: src/cli/cadet/gnunet-cadet.c:775
+msgid "No action requested\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+#: src/cli/cadet/gnunet-cadet.c:800
+msgid "Provide information about a particular connection"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
-
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:951
-#, c-format
-msgid "Failed to start service `%s'\n"
+#: src/cli/cadet/gnunet-cadet.c:817
+msgid "Provide information about a patricular peer"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:962
-#, c-format
-msgid "Starting service `%s'\n"
+#: src/cli/cadet/gnunet-cadet.c:822
+msgid "Provide information about all peers"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1062
-#, c-format
-msgid "Unable to create socket for service `%s': %s\n"
+#: src/cli/cadet/gnunet-cadet.c:827
+msgid "Provide information about all tunnels"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1093
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/cli/core/gnunet-core.c:91
+msgid "fresh connection"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1124
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1272
-#, c-format
-msgid "Preparing to stop `%s'\n"
+#: src/cli/core/gnunet-core.c:99
+msgid "key received"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1604
-#, c-format
-msgid "Restarting service `%s'.\n"
+#: src/cli/core/gnunet-core.c:103
+msgid "connection established"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
-msgstr "exit"
-
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
-msgstr "signal"
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1765
-msgid "unknown"
-msgstr "inconnu"
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "Déconnecté de"
 
-#: src/arm/gnunet-service-arm.c:1771
-#, c-format
-msgid "Service `%s' took %s to terminate\n"
+#: src/cli/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "adresse inconnue"
+
+#: src/cli/core/gnunet-core.c:129
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/core/gnunet-core.c:157
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
+#: src/cli/core/gnunet-core.c:163
+msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/core/gnunet-core.c:196
+msgid "Print information about connected peers."
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:187
-msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+#: src/cli/datastore/gnunet-datastore.c:257
+#, c-format
+msgid "Error queueing datastore GET operation\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
-msgid "public auction outcome"
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, c-format
+msgid "Unable to open dump file: %s\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/datastore/gnunet-datastore.c:319
+#, c-format
+msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
-msgid "help text"
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/datastore/gnunet-datastore.c:378
 #, c-format
-msgid "Invalid peer ID `%s'\n"
+msgid "Error queueing datastore PUT operation\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/datastore/gnunet-datastore.c:417
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/datastore/gnunet-datastore.c:442
 #, c-format
-msgid "Invalid target `%s'\n"
+msgid "Failed connecting to the datastore.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:775
-msgid "No action requested\n"
+#: src/cli/datastore/gnunet-datastore.c:454
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:800
-msgid "Provide information about a particular connection"
+#: src/cli/datastore/gnunet-datastore.c:477
+msgid "Dump all records from the datastore"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/datastore/gnunet-datastore.c:482
+msgid "Insert records into the datastore"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
-msgid "Provide information about a patricular peer"
+#: src/cli/datastore/gnunet-datastore.c:498
+msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:822
-msgid "Provide information about all peers"
+#: src/cli/dht/gnunet-dht-get.c:166
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
 
-#: src/cadet/gnunet-cadet.c:827
-msgid "Provide information about all tunnels"
+#: src/cli/dht/gnunet-dht-get.c:167
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
 msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
-msgid "Connection to conversation service lost, trying to reconnect\n"
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
 #, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
+msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
+#: src/cli/dht/gnunet-dht-get.c:256
+msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
-#, c-format
-msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
-#, c-format
-msgid "Call from `%s' terminated\n"
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+msgid "use DHT's record route option"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
-#, c-format
-msgid "Call from `%s' suspended by other user\n"
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
-#, c-format
-msgid "Call from `%s' resumed by other user\n"
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
-#, c-format
-msgid "Ego `%s' no longer available, phone is now down.\n"
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
-msgid "Failed to setup phone (internal error)\n"
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:368
-#, c-format
-msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
-#, c-format
-msgid "Resolved address of `%s'. Now ringing other party.\n"
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
-#, c-format
-msgid "Connection established to `%s'\n"
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:404
-#, c-format
-msgid "Failed to resolve `%s'\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/conversation/gnunet-conversation.c:411
-#, fuzzy, c-format
-msgid "Call to `%s' terminated\n"
-msgstr "Appel terminé\n"
-
-#: src/conversation/gnunet-conversation.c:420
-#, c-format
-msgid "Connection to `%s' suspended (by other user)\n"
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
-#, c-format
-msgid "Connection to `%s' resumed (by other user)\n"
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/cli/dht/gnunet-dht-put.c:140
 #, c-format
-msgid "Error with the call, restarting it\n"
+msgid "Could not connect to DHT service!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/cli/dht/gnunet-dht-put.c:151
 #, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Commande « %s » inconnue\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
-#, c-format
-msgid "Ego `%s' not available\n"
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
-#, c-format
-msgid "You are calling someone else already, hang up first!\n"
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
-#, c-format
-msgid "You are answering call from `%s', hang up or suspend that call first!\n"
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
-#, c-format
-msgid "Call recipient missing.\n"
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:607
-#, c-format
-msgid "There is no incoming call to accept here!\n"
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/cli/fs/gnunet-auto-share.c:234
 #, c-format
-msgid "There is no incoming call `%s' to accept right now!\n"
+msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
-msgid "We currently do not have an address.\n"
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
+#, c-format
+msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/cli/fs/gnunet-auto-share.c:401
 #, c-format
-msgid "We are currently trying to locate the private key for the ego `%s'.\n"
-msgstr ""
+msgid "Publication of `%s' done\n"
+msgstr "Publication de « %s » terminée\n"
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/cli/fs/gnunet-auto-share.c:480
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
-msgstr ""
+msgid "Publishing `%s'\n"
+msgstr "Publication de « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/cli/fs/gnunet-auto-share.c:491
 #, c-format
-msgid "You are having a conversation with `%s'.\n"
+msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/cli/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
-"We had an internal error setting up our phone line. You can still make "
-"calls.\n"
+"You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
-#, c-format
-msgid "We are trying to find the network address to call `%s'.\n"
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
-#, c-format
-msgid "We are calling `%s', their phone should be ringing.\n"
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:728
-msgid "Calls waiting:\n"
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
-#, c-format
-msgid "#%u: `%s'\n"
-msgstr "#%u : « %s »\n"
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
-msgid "There is no call that could be suspended right now.\n"
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
-msgid "There is no call that could be resumed right now.\n"
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/cli/fs/gnunet-directory.c:54
 #, c-format
-msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/cli/fs/gnunet-directory.c:106
 #, c-format
-msgid "There is no incoming call to resume here!\n"
+msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/cli/fs/gnunet-directory.c:109
 #, c-format
-msgid "There is no incoming call `%s' to resume right now!\n"
+msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
-msgid "There is no call that could be cancelled right now.\n"
+#: src/cli/fs/gnunet-directory.c:146
+msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/cli/fs/gnunet-directory.c:160
 #, c-format
-msgid "There is no incoming call to refuse here!\n"
+msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/cli/fs/gnunet-directory.c:170
 #, c-format
-msgid "There is no incoming call `%s' to refuse right now!\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation.c:941
-msgid "Use `/address' to find out which address this phone should have in GNS"
+msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
-msgid "Use `/call USER.gnu' to call USER"
+#: src/cli/fs/gnunet-directory.c:201
+msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
-msgid "Use `/accept #NUM' to accept incoming call #NUM"
+#: src/cli/fs/gnunet-download.c:131
+#, c-format
+msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
-msgid "Use `/suspend' to suspend the active call"
+#: src/cli/fs/gnunet-download.c:143
+msgid "<unknown time>"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
 msgid ""
-"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
-"calls, no argument is needed to resume the current outgoing call."
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
-msgid "Use `/cancel' to reject or terminate a call"
+#: src/cli/fs/gnunet-download.c:177
+#, c-format
+msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
-msgid "Use `/status' to print status information"
+#: src/cli/fs/gnunet-download.c:189
+#, c-format
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
-msgid "Use `/quit' to terminate gnunet-conversation"
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
+#, c-format
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
-msgid "Use `/help command' to get help for a specific command"
+#: src/cli/fs/gnunet-download.c:234
+msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1124
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
 #, c-format
-msgid "Name of our ego changed to `%s'\n"
+msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1134
-#, c-format
-msgid "Our ego `%s' was deleted!\n"
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1166
-msgid "You must specify the NAME of an ego to use\n"
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1193
-msgid "sets the NAME of the ego to use for the caller ID"
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
+#, c-format
+msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
-msgid "sets the LINE to use for the phone"
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
-msgid "Enables having a conversation with other GNUnet users."
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
-#, c-format
-msgid "pa_stream_write() failed: %s\n"
-msgstr "pa_stream_write() échoué : %s\n"
-
-#: src/conversation/gnunet-helper-audio-playback.c:649
-msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
-msgid "Connection established.\n"
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
-#, c-format
-msgid "pa_stream_new() failed: %s\n"
-msgstr "pa_stream_new() échoué : %s\n"
-
-#: src/conversation/gnunet-helper-audio-playback.c:697
-#, c-format
-msgid "pa_stream_connect_playback() failed: %s\n"
-msgstr "pa_stream_connect_playback() échoué : %s\n"
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
-#, c-format
-msgid "Connection failure: %s\n"
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
-msgid "Wrong Spec\n"
-msgstr "Spécification incorrecte\n"
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
-msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() échoué.\n"
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
-msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() échoué.\n"
+#: src/cli/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
 #, c-format
-msgid "pa_context_connect() failed: %s\n"
-msgstr "pa_context_connect() échoué : %s\n"
-
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
-msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() échoué.\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/cli/fs/gnunet-publish.c:247
 #, c-format
-msgid "Read error from STDIN: %s\n"
+msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/cli/fs/gnunet-publish.c:255
 #, c-format
-msgid "opus_encode_float() failed: %s. Aborting\n"
-msgstr "opus_encode_float() échoué : %s. Annulation\n"
+msgid "Publishing `%s' done.\n"
+msgstr "Publication de « %s » terminée.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/cli/fs/gnunet-publish.c:259
 #, c-format
-msgid "pa_stream_peek() failed: %s\n"
-msgstr "pa_stream_peek() échoué : %s\n"
+msgid "URI is `%s'.\n"
+msgstr "L’URI est « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
-msgid "Got signal, exiting.\n"
-msgstr ""
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "L’URI est « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:504
-msgid "Stream successfully created.\n"
+#: src/cli/fs/gnunet-publish.c:280
+msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:509
-#, c-format
-msgid "pa_stream_get_buffer_attr() failed: %s\n"
-msgstr "pa_stream_get_buffer_attr() échoué : %s\n"
-
-#: src/conversation/gnunet-helper-audio-record.c:516
-#, c-format
-msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+#: src/cli/fs/gnunet-publish.c:287
+msgid "Cleanup after abort completed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
-#, c-format
-msgid "Using sample spec '%s', channel map '%s'.\n"
+#: src/cli/fs/gnunet-publish.c:292
+msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/cli/fs/gnunet-publish.c:426
 #, c-format
-msgid "Connected to device %s (%u, %ssuspended).\n"
+msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/cli/fs/gnunet-publish.c:428
 #, c-format
-msgid "Stream error: %s\n"
+msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:586
-#, c-format
-msgid "pa_stream_connect_record() failed: %s\n"
-msgstr "pa_stream_connect_record() échoué : %s\n"
+#: src/cli/fs/gnunet-publish.c:583
+msgid "Could not publish\n"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:703
-msgid "ogg_stream_init() failed.\n"
-msgstr "ogg_stream_init() échoué.\n"
+#: src/cli/fs/gnunet-publish.c:612
+msgid "Could not start publishing.\n"
+msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/cli/fs/gnunet-publish.c:645
 #, c-format
-msgid "Failed to allocate %u bytes for second packet\n"
+msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/cli/fs/gnunet-publish.c:647
 #, c-format
-msgid "Could not open line, port %s already in use!\n"
+msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/conversation/microphone.c:118
-msgid "Could not start record audio helper\n"
+#: src/cli/fs/gnunet-publish.c:653
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
-#, c-format
-msgid "PHONE version %u not supported\n"
+#: src/cli/fs/gnunet-publish.c:659
+msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/cli/fs/gnunet-publish.c:665
 #, c-format
-msgid "Unable to parse PHONE record `%s'\n"
+msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/conversation/speaker.c:73
-msgid "Could not start playback audio helper.\n"
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:91
-msgid "fresh connection"
+#: src/cli/fs/gnunet-publish.c:679
+msgid "Error scanning directory.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/cli/fs/gnunet-publish.c:706
+#, c-format
+msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
-msgid "key received"
+#: src/cli/fs/gnunet-publish.c:738
+#, c-format
+msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:103
-msgid "connection established"
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/cli/fs/gnunet-publish.c:811
+#, c-format
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:111
-#, fuzzy
-msgid "disconnected"
-msgstr "Déconnecté de"
-
-#: src/core/gnunet-core.c:120
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/cli/fs/gnunet-publish.c:818
+#, c-format
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:124
-#, fuzzy
-msgid "unknown state"
-msgstr "adresse inconnue"
-
-#: src/core/gnunet-core.c:129
+#: src/cli/fs/gnunet-publish.c:824
 #, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
+#: src/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
 #, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:163
-msgid "Failed to connect to CORE service!\n"
+#: src/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
-msgid "provide information about all current connections (continuously)"
+#: src/cli/fs/gnunet-publish.c:907
+msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/core/gnunet-core.c:196
-msgid "Print information about connected peers."
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:329
-msgid "# send requests dropped (disconnected)"
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:355
-msgid "# dequeuing CAR (duplicate request)"
+#: src/cli/fs/gnunet-publish.c:928
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
-#, c-format
-msgid "# bytes of messages of type %u received"
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:505
-msgid "# messages discarded (session disconnected)"
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:824
-#, c-format
-msgid "# messages of type %u discarded (client busy)"
+#: src/cli/fs/gnunet-publish.c:953
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:926
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/cli/fs/gnunet-publish.c:965
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:954
-#, c-format
-msgid "Core service of `%s' ready.\n"
+#: src/cli/fs/gnunet-publish.c:972
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:511
-msgid "# bytes encrypted"
+#: src/cli/fs/gnunet-publish.c:980
+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/core/gnunet-service-core_kx.c:569
-msgid "# bytes decrypted"
+#: src/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:666
-msgid "# PAYLOAD dropped (out of order)"
+#: src/cli/fs/gnunet-search.c:446
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:718
-msgid "# key exchanges initiated"
+#: src/cli/fs/gnunet-search.c:535
+#, c-format
+msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:774
-msgid "# key exchanges stopped"
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:806
-msgid "# PING messages transmitted"
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:865
-msgid "# old ephemeral keys ignored"
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
-msgid "# duplicate ephemeral keys ignored"
+#: src/cli/fs/gnunet-search.c:629
+msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
-msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/cli/fs/gnunet-search.c:662
 #, c-format
-msgid ""
-"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
-"our system time (%llu not in [%llu,%llu]).\n"
+msgid "Could not initialize the `%s` subsystem.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
-msgid "# EPHEMERAL_KEY messages rejected due to time"
+#: src/cli/fs/gnunet-search.c:676
+msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:962
-msgid "# valid ephemeral keys received"
+#: src/cli/fs/gnunet-search.c:702
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1072
-msgid "# PING messages received"
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1082
-msgid "# PING messages dropped (out of order)"
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1134
-msgid "# PONG messages created"
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1159
-msgid "# sessions terminated by timeout"
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1172
-msgid "# keepalive messages sent"
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1229
-msgid "# PONG messages received"
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1237
-msgid "# PONG messages dropped (connection down)"
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1246
-msgid "# PONG messages dropped (out of order)"
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1288
-msgid "# PONG messages decrypted"
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1331
-msgid "# session keys confirmed via PONG"
+#: src/cli/fs/gnunet-search.c:789
+msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1343
-msgid "# timeouts prevented via PONG"
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1352
-msgid "# rekey operations confirmed via PONG"
+#: src/cli/fs/gnunet-unindex.c:103
+#, c-format
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
-msgid "# DATA message dropped (out of order)"
+#: src/cli/fs/gnunet-unindex.c:109
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/cli/fs/gnunet-unindex.c:142
 #, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
-msgid "# sessions terminated by key expiration"
+#: src/cli/fs/gnunet-unindex.c:162
+msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
-msgid "# bytes dropped (duplicates)"
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1632
-msgid "# bytes dropped (out of sequence)"
+#: src/cli/gns/gnunet-gns.c:256
+#, c-format
+msgid "`%s' is not a valid DNS domain name\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1679
-msgid "# bytes dropped (ancient message)"
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1689
-msgid "# bytes of payload decrypted"
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
-msgid "# peers connected"
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, c-format
+msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:285
-msgid "# type map refreshes sent"
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:400
-msgid "# outdated typemap confirmations received"
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:418
-msgid "# valid typemap confirmations received"
+#: src/cli/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
-msgid "# type maps received"
+#: src/cli/gns/gnunet-gns.c:351
+msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:217
-msgid "# updates to my type map"
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:492
-msgid "Heap datacache running\n"
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
+#: src/cli/gns/gnunet-gns.c:374
+msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/cli/identity/gnunet-identity.c:225
+#, c-format
+msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:340
-#, fuzzy
-msgid "DATASTORE disconnected"
-msgstr "Déconnecté de"
-
-#: src/datastore/datastore_api.c:462
-#, fuzzy
-msgid "Disconnected from DATASTORE"
-msgstr "Déconnecté de"
-
-#: src/datastore/datastore_api.c:565
-msgid "# queue overflows"
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
 msgstr ""
 
-#: src/datastore/datastore_api.c:595
-msgid "# queue entries created"
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
 msgstr ""
 
-#: src/datastore/datastore_api.c:756
-msgid "# status messages received"
+#: src/cli/identity/gnunet-identity.c:551
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:810
-msgid "# Results received"
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:917
-msgid "# datastore connections (re)created"
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1007
-msgid "# PUT requests executed"
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1068
-msgid "# RESERVE requests executed"
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1113
-msgid "# RELEASE RESERVE requests executed"
-msgstr ""
+#: src/cli/identity/gnunet-identity.c:576
+#, fuzzy
+msgid "reduce output"
+msgstr "sortie verbeuse"
 
-#: src/datastore/datastore_api.c:1171
-msgid "# REMOVE requests executed"
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1230
-msgid "# GET REPLICATION requests executed"
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1276
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
-msgid "# GET requests executed"
+#: src/cli/identity/gnunet-identity.c:597
+msgid "display private keys as well"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
+#: src/cli/namecache/gnunet-namecache.c:105
 #, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
+msgid "No records found for `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:257
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
 #, c-format
-msgid "Error queueing datastore GET operation\n"
+msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
+#: src/cli/namecache/gnunet-namecache.c:174
 #, c-format
-msgid "Unable to open dump file: %s\n"
+msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:319
-#, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr ""
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/datastore/gnunet-datastore.c:331
+#: src/cli/namecache/gnunet-namecache.c:187
 #, c-format
-msgid "Inserted %<PRIu64> records\n"
+msgid "You must specify a name\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:378
-#, c-format
-msgid "Error queueing datastore PUT operation\n"
+#: src/cli/namecache/gnunet-namecache.c:220
+msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:442
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
 #, c-format
-msgid "Failed connecting to the datastore.\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:454
-#, c-format
-msgid "Please choose at least one operation: %s, %s\n"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:477
-msgid "Dump all records from the datastore"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:482
-msgid "Insert records into the datastore"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:498
-msgid "Manipulate GNUnet datastore"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:335
-msgid "# bytes expired"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:419
-msgid "# bytes purged (low-priority)"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, c-format
+msgid "Name `%s' is too long\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:551
-msgid "# results found"
-msgstr "# résultats introuvables"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:593
-#, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
-"%llu bytes\n"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:612
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:619
-msgid "Insufficient space to satisfy request"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Appel terminé\n"
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
-msgid "# reserved"
-msgstr "# réservé"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:693
-msgid "Could not find matching reservation"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:743
-msgid "# bytes stored"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/cli/namestore/gnunet-namestore.c:411
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:858
-msgid "# GET requests received"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Commande « %s » inconnue\n"
 
-#: src/datastore/gnunet-service-datastore.c:888
-msgid "# GET KEY requests received"
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:899
-msgid "# requests filtered by bloomfilter"
+#: src/cli/namestore/gnunet-namestore.c:434
+#, c-format
+msgid "Error parsing expiration time %s.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:940
-msgid "# GET REPLICATION requests received"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "fornat invalide : « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:971
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/cli/namestore/gnunet-namestore.c:668
+#, c-format
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1012
-msgid "Content not found"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/datastore/gnunet-service-datastore.c:1019
-msgid "# bytes removed (explicit request)"
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
-msgid "# REMOVE requests received"
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/cli/namestore/gnunet-namestore.c:1302
 #, c-format
 msgid ""
-"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/cli/namestore/gnunet-namestore.c:1327
 #, c-format
-msgid "New payload: %lld\n"
+msgid "%s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/cli/namestore/gnunet-namestore.c:1356
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "No options given\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/cli/namestore/gnunet-namestore.c:1370
 #, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1236
-msgid "Bloomfilter construction complete.\n"
+msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/cli/namestore/gnunet-namestore.c:1381
+msgid "name"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/cli/namestore/gnunet-namestore.c:1410
 #, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
+msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1472
-msgid "# quota"
-msgstr "# quota"
-
-#: src/datastore/gnunet-service-datastore.c:1475
-msgid "# cache size"
-msgstr "# taille du cache"
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr "ajouter"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/cli/namestore/gnunet-namestore.c:1461
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/cli/namestore/gnunet-namestore.c:1471
 #, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1573
-msgid "Failed to initialize bloomfilter.\n"
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:895
-msgid "Heap database running\n"
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
-msgid "Postgresql exec failure"
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, c-format
+msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
-msgid "Failed to drop table from database.\n"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr "supprimer"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
-#, c-format
-msgid "`%s' failed at %s:%u with error: %s"
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:634
-msgid "sqlite bind failure"
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
-msgid "Data too large"
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
-#, fuzzy
-msgid "error preparing statement\n"
-msgstr "Erreur de création du tunnel\n"
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "URI invalide « %s »\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
-msgid "error stepping\n"
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, c-format
+msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/cli/namestore/gnunet-namestore.c:1967
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-msgid "Sqlite database running\n"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr "ajouter un enregistrement"
 
-#: src/datastore/plugin_datastore_template.c:252
-msgid "Template database running\n"
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr "suprimer un enregistrement"
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr "afficher les enregistrements"
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
+#: src/cli/namestore/gnunet-namestore.c:2004
 msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
-"Resultat %d, type %d :\n"
-"%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:167
-#, fuzzy, c-format
-msgid "Result %d, type %d:\n"
+#: src/cli/namestore/gnunet-namestore.c:2010
+msgid "set the desired nick name for the zone"
 msgstr ""
-"Resultat %d, type %d :\n"
-"%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
+#: src/cli/namestore/gnunet-namestore.c:2015
+msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, c-format
-msgid "Failed to connect to DHT service!\n"
+#: src/cli/namestore/gnunet-namestore.c:2025
+msgid "Output in recordline format"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256
-msgid "Issuing DHT GET with key"
+#: src/cli/namestore/gnunet-namestore.c:2031
+msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-msgid "use DHT's record route option"
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore.c:2056
+#, fuzzy
+msgid "omit private records"
+msgstr "afficher les enregistrements"
 
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
-#, c-format
-msgid "Could not connect to DHT service!\n"
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+msgid "Suggested configuration changes:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, c-format
+msgid "Wrote updated configuration to `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+msgid "run autoconfiguration"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:925
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "nombre de valeurs"
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "number of PUTs to perform per peer"
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+msgid "GNUnet NAT traversal autoconfiguration"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
-msgid "name of the file with the login information for the testbed"
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:976
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
-msgid "delay to start doing PUTs (default: 1 sec)"
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
-msgid "delay to start doing GETs (default: 5 min)"
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
-msgid "replication degree for DHT PUTs"
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
-msgid "chance that a peer is selected at random for PUTs"
+#: src/cli/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+#: src/cli/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
-msgid "Measure quality and performance of the DHT service."
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:463
-msgid "# DNS requests answered via TUN interface"
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:617
-msgid "# DNS exit failed (failed to open socket)"
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:753
-msgid "# External DNS response discarded (no matching request)"
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:829
-msgid "# Client response discarded (no matching request)"
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:951
-msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, c-format
+msgid "Ego is required\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:970
-msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/cli/reclaim/gnunet-reclaim.c:819
 #, c-format
-msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
+msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:993
-msgid "DNS interceptor got non-DNS packet (dropped)\n"
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
-msgid "# Non-DNS UDP packet received via TUN interface"
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1066
-msgid "# DNS requests received via TUN interface"
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
-msgid "need a valid IPv4 or IPv6 address\n"
+#: src/cli/reclaim/gnunet-reclaim.c:852
+msgid "The EGO to use"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1125
-#, c-format
-msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
-msgid "# TCP packets sent via TUN"
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1074
-msgid "# ICMP packets sent via TUN"
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1368
-msgid "# UDP packets sent via TUN"
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
-msgid "# Bytes received from CADET"
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1504
-msgid "# UDP IP-exit requests received via cadet"
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1616
-msgid "# UDP service requests received via cadet"
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1658
-msgid "# TCP service creation requests received via cadet"
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1749
-msgid "# TCP IP-exit creation requests received via cadet"
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1837
-msgid "# TCP DATA requests dropped (no session)"
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1876
-msgid "# TCP data requests received via cadet"
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2017
-msgid "# ICMP IP-exit requests received via cadet"
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "En cous de démarrage %s…\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, c-format
+msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2287
-msgid "# ICMP service requests received via cadet"
+#: src/cli/revocation/gnunet-revocation.c:150
+#, c-format
+msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+#: src/cli/revocation/gnunet-revocation.c:154
+msgid "Internal error\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/cli/revocation/gnunet-revocation.c:180
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
-msgid "# Inbound CADET channels created"
+#: src/cli/revocation/gnunet-revocation.c:183
+msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/cli/revocation/gnunet-revocation.c:189
 #, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636
-msgid "# Messages transmitted via cadet channels"
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2828
-msgid "# ICMP packets dropped (not allowed)"
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2837
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2913
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2987
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/cli/revocation/gnunet-revocation.c:334
+#, c-format
+msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3036
-msgid "# Packets received from TUN"
+#: src/cli/revocation/gnunet-revocation.c:350
+#, c-format
+msgid "Error: Key is invalid\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3051
-msgid "# Bytes received from TUN"
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3078
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3109
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3161
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/cli/revocation/gnunet-revocation.c:424
 #, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
-#, c-format
-msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+#: src/cli/revocation/gnunet-revocation.c:434
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
-#, c-format
-msgid "`%s' is not a valid port number (for domain `%s')!"
+#: src/cli/revocation/gnunet-revocation.c:464
+msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/cli/revocation/gnunet-revocation.c:481
 #, c-format
-msgid "No addresses found for hostname `%s' of service `%s'!\n"
+msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/cli/revocation/gnunet-revocation.c:489
 #, c-format
-msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
+msgid "Revocation certificate corrupted in `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3492
-#, c-format
-msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
+#: src/cli/revocation/gnunet-revocation.c:511
+msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3637
-msgid ""
-"This system does not support IPv4, will disable IPv4 functions despite them "
-"being enabled in the configuration\n"
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/cli/revocation/gnunet-revocation.c:538
 msgid ""
-"This system does not support IPv6, will disable IPv6 functions despite them "
-"being enabled in the configuration\n"
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
-msgid ""
-"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
-"ENABLE_IPv4=YES\n"
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3661
-msgid ""
-"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
-"ENABLE_IPv6=YES\n"
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3832
-msgid "Must be a number"
-msgstr "Doit être un nombre"
-
-#: src/exit/gnunet-daemon-exit.c:3948
-#, c-format
-msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
+#: src/cli/revocation/gnunet-revocation.c:558
+msgid "number of epochs to calculate for"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
-msgid "No useful service enabled.  Exiting.\n"
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
+msgid "help text"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4114
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:481
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
 #, c-format
-msgid "Could not open file `%s': %s"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:492
-#, c-format
-msgid "Could not read file `%s': %s"
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/fs/fs_api.c:500
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1157
+#: src/cli/statistics/gnunet-statistics.c:577
 #, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
+msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1708
+#: src/cli/statistics/gnunet-statistics.c:589
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1723
+#: src/cli/statistics/gnunet-statistics.c:725
 #, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr ""
+msgid "Invalid argument `%s'\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/fs/fs_api.c:2452
+#: src/cli/statistics/gnunet-statistics.c:742
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2463
+#: src/cli/statistics/gnunet-statistics.c:751
 #, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/cli/statistics/gnunet-statistics.c:783
 #, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2629
-#, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
-#, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/fs/fs_api.c:2847
-#, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/fs/fs_api.c:3108
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
 msgstr ""
 
-#: src/fs/fs_directory.c:216
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/fs/fs_download.c:311
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
 msgstr ""
 
-#: src/fs/fs_download.c:333
-msgid "Directory too large for system address space\n"
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
 msgstr ""
 
-#: src/fs/fs_download.c:347
-#, c-format
-msgid ""
-"Failed to access full directory contents of `%s' for recursive download\n"
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
 msgstr ""
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
-#, c-format
-msgid "Failed to open file `%s' for writing"
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
 msgstr ""
 
-#: src/fs/fs_download.c:961
-#, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/fs/fs_download.c:1045
-#, c-format
-msgid ""
-"Internal error or bogus download URI (expected %lu bytes at depth %u and "
-"offset %llu/%llu, got %lu bytes)"
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/fs/fs_download.c:1067
-msgid "internal error decrypting content"
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/fs/fs_download.c:1090
-#, c-format
-msgid "Download failed: could not open file `%s': %s"
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
 msgstr ""
 
-#: src/fs/fs_download.c:1101
-#, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s"
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/fs/fs_download.c:1111
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
 msgstr ""
 
-#: src/fs/fs_download.c:1219
-msgid "internal error decoding tree"
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/fs/fs_download.c:1890
-msgid "Invalid URI"
-msgstr "URI invalide"
+#: src/cli/util/gnunet-config.c:192
+msgid "Manipulate GNUnet configuration files"
+msgstr ""
 
-#: src/fs/fs_getopt.c:237
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:191
+#: src/cli/util/gnunet-ecc.c:95
 #, c-format
-msgid "Failed to not connect to `%s' service.\n"
+msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:129
+#: src/cli/util/gnunet-ecc.c:129
 #, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
+msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/fs/fs_namespace.c:203
+#: src/cli/util/gnunet-ecc.c:137
 #, c-format
-msgid "Failed to open `%s' for writing: %s\n"
+msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/fs/fs_namespace.c:234
+#: src/cli/util/gnunet-ecc.c:178
 #, c-format
-msgid "Failed to write `%s': %s\n"
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:331
+#: src/cli/util/gnunet-ecc.c:185
 #, c-format
-msgid "Failed to read `%s': %s\n"
+msgid ""
+"\n"
+"Finished!\n"
 msgstr ""
+"\n"
+"Terminé !\n"
 
-#: src/fs/fs_namespace.c:458
-msgid "Failed to connect to datastore."
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/cli/util/gnunet-ecc.c:304
 #, c-format
-msgid "Publishing failed: %s"
+msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:732
-#, fuzzy, c-format
-msgid "Can not index file `%s': %s.\n"
-msgstr "Résolution de « %s » échouée : %s\n"
-
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/cli/util/gnunet-ecc.c:314
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:791
-msgid "error on index-start request to `fs' service"
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:837
-msgid "failed to compute hash"
+#: src/cli/util/gnunet-ecc.c:334
+#, c-format
+msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:857
-msgid "filename too long"
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:889
-msgid "could not connect to `fs' service"
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
-#, c-format
-msgid "Failed to get file identifiers for `%s'\n"
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
-msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
-#, c-format
-msgid "Recursive upload failed at `%s': %s"
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/fs/fs_publish.c:1116
-#, c-format
-msgid "Recursive upload failed: %s"
+#: src/cli/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/fs/fs_publish.c:1157
-msgid "needs to be an actual file"
+#: src/cli/util/gnunet-ecc.c:479
+msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/fs/fs_publish.c:1397
-#, fuzzy, c-format
-msgid "Datastore failure: %s"
-msgstr "pa_stream_new() échoué : %s\n"
-
-#: src/fs/fs_publish.c:1489
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:213
-msgid "Could not connect to datastore."
+#: src/cli/util/gnunet-ecc.c:499
+msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:215
-msgid "Internal error."
-msgstr "Erreur interne."
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "URI invalide « %s »\n"
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/cli/util/gnunet-qr.c:161
 #, c-format
-msgid "Failed to parse URI `%s': %s\n"
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr ""
 
-#: src/fs/fs_search.c:994
+#: src/cli/util/gnunet-qr.c:171
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
-msgid "Failed to find given position in file"
+#: src/cli/util/gnunet-qr.c:182
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:69
-msgid "Failed to read file"
+#: src/cli/util/gnunet-qr.c:218
+#, c-format
+msgid "Unable to start child process `%s'\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:276
-msgid "Error communicating with `fs' service."
-msgstr ""
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/fs/fs_unindex.c:327
-msgid "Failed to connect to FS service for unindexing."
-msgstr ""
+#: src/cli/util/gnunet-qr.c:261
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "En cous de démarrage %s…\n"
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
-msgid "Failed to get KSKs from directory scan."
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:386
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
 #, c-format
-msgid "Internal error scanning `%s'.\n"
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:447
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
 #, c-format
-msgid "Failed to remove UBlock: %s\n"
-msgstr ""
-
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
-msgid "Failed to connect to `datastore' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:670
-msgid "Failed to open file for unindexing."
+msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:709
-msgid "Failed to compute hash of file."
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, c-format
+msgid "%s is not a PNG file\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:232
-#, no-c-format
-msgid "Malformed KSK URI (`%' must be followed by HEX number)"
-msgstr ""
+#: src/cli/util/gnunet-qr.c:546
+#, fuzzy
+msgid "No data found\n"
+msgstr "upnpc introuvable\n"
 
-#: src/fs/fs_uri.c:291
-msgid "Malformed KSK URI (must not begin or end with `+')"
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:309
-msgid "Malformed KSK URI (`++' not allowed)"
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
-msgid "Malformed KSK URI (quotes not balanced)"
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/fs/fs_uri.c:383
-msgid "Malformed SKS URI (wrong syntax)"
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/fs/fs_uri.c:424
-msgid "Malformed CHK URI (wrong syntax)"
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/fs/fs_uri.c:441
-msgid "Malformed CHK URI (failed to decode CHK)"
+#: src/cli/util/gnunet-resolver.c:183
+msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
-msgid "LOC URI malformed (wrong syntax)"
+#: src/cli/util/gnunet-scrypt.c:215
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:535
-msgid "LOC URI malformed (no CHK)"
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+msgid "Value is too large.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
-msgid "LOC URI malformed (missing LOC)"
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
-msgid "LOC URI malformed (wrong syntax for public key)"
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/fs/fs_uri.c:562
-msgid "LOC URI malformed (could not decode public key)"
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/fs/fs_uri.c:568
-msgid "LOC URI malformed (could not find signature)"
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
-msgid "LOC URI malformed (wrong syntax for signature)"
+#: src/cli/util/gnunet-scrypt.c:313
+msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "LOC URI malformed (could not decode signature)"
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
-msgid "LOC URI malformed (wrong syntax for expiration time)"
+#: src/cli/util/gnunet-uri.c:95
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:599
-msgid "LOC URI malformed (could not parse expiration time)"
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:613
-msgid "LOC URI malformed (signature failed validation)"
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:646
-#, fuzzy
-msgid "invalid argument"
-msgstr "Argument invalide « %s »\n"
-
-#: src/fs/fs_uri.c:666
-msgid "Unrecognized URI type"
-msgstr "Type d’URI non reconnu"
-
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
-msgid "No keywords specified!\n"
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/fs/fs_uri.c:1094
-msgid "Number of double-quotes not balanced!\n"
-msgstr ""
+#: src/cli/vpn/gnunet-vpn.c:142
+msgid "Error creating tunnel\n"
+msgstr "Erreur de création du tunnel\n"
 
-#: src/fs/gnunet-auto-share.c:234
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
 #, c-format
-msgid "Failed to load state: %s\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
+#: src/cli/vpn/gnunet-vpn.c:202
 #, c-format
-msgid "Failed to save state to file %s\n"
+msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr "Publication de « %s » terminée\n"
-
-#: src/fs/gnunet-auto-share.c:480
+#: src/cli/vpn/gnunet-vpn.c:216
 #, c-format
-msgid "Publishing `%s'\n"
-msgstr "Publication de « %s »\n"
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr ""
 
-#: src/fs/gnunet-auto-share.c:491
+#: src/cli/vpn/gnunet-vpn.c:239
 #, c-format
-msgid "Failed to run `%s'\n"
+msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:661
+#: src/cli/vpn/gnunet-vpn.c:258
 #, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
+msgid "`%s' is not a valid IP address.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:668
-msgid "Daemon to use file-sharing to measure its performance."
+#: src/cli/vpn/gnunet-vpn.c:334
+msgid "service is offered via TCP"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/cli/vpn/gnunet-vpn.c:339
+msgid "service is offered via UDP"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:106
-#, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr ""
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr "Configurer des tunnels via VPN."
 
-#: src/fs/gnunet-directory.c:109
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
 #, c-format
-msgid "Directory `%s' contents:\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:146
-msgid "You must specify a filename to inspect.\n"
+msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:160
-#, c-format
-msgid "Failed to read directory `%s'\n"
+#: src/contrib/service/abd/gnunet-abd.c:566
+msgid "Ego does not exist!\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:170
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
 #, c-format
-msgid "`%s' is not a GNUnet directory\n"
+msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:201
-msgid "Display contents of a GNUnet directory"
-msgstr ""
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/fs/gnunet-download.c:131
+#: src/contrib/service/abd/gnunet-abd.c:865
 #, c-format
-msgid "Starting download `%s'.\n"
+msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:143
-msgid "<unknown time>"
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, c-format
+msgid "ego required\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:155
+#: src/contrib/service/abd/gnunet-abd.c:882
 #, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
+msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:177
+#: src/contrib/service/abd/gnunet-abd.c:890
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/contrib/service/abd/gnunet-abd.c:924
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
+#: src/contrib/service/abd/gnunet-abd.c:983
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
-msgid "You need to specify a URI argument.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
-#, c-format
-msgid "Failed to parse URI: %s\n"
+#: src/contrib/service/abd/gnunet-abd.c:1011
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1025
+msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, c-format
-msgid "Could not initialize `%s' subsystem.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1030
+msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
 msgstr ""
 
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:211
-msgid "run the experiment with COUNT peers"
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:218
-msgid "specifies name of a file with the HOSTS the testbed should use"
+#: src/contrib/service/abd/gnunet-abd.c:1098
+msgid "GNUnet abd resolver tool"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:225
-msgid "automatically terminate experiment after DELAY"
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:237
-msgid "run a testbed to measure file-sharing performance"
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:247
-#, c-format
-msgid "Error publishing: %s.\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr "Publication de « %s » terminée.\n"
-
-#: src/fs/gnunet-publish.c:259
-#, c-format
-msgid "URI is `%s'.\n"
-msgstr "L’URI est « %s ».\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr "L’URI est « %s ».\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:280
-msgid "Starting cleanup after abort\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:287
-msgid "Cleanup after abort completed.\n"
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
+msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:292
-msgid "Cleanup after abort failed.\n"
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:426
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
-msgid "Meta data for file `%s' (%s)\n"
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:428
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
-msgid "Keywords for file `%s' (%s)\n"
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
-msgid "Could not publish\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:264
+#, c-format
+msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
-msgid "Could not start publishing.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:287
+#, c-format
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:645
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
-msgid "Scanning directory `%s'.\n"
+msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:647
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
-msgid "Scanning file `%s'.\n"
+msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
+msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:659
-msgid "Preprocessing complete.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:356
+msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:665
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:671
-msgid "Meta data extraction has finished.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:391
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
-msgid "Error scanning directory.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:398
+#, c-format
+msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:706
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr ""
+msgid "Failed to resolve `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/fs/gnunet-publish.c:738
+#: src/contrib/service/conversation/gnunet-conversation.c:411
+#, fuzzy, c-format
+msgid "Call to `%s' terminated\n"
+msgstr "Appel terminé\n"
+
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
-msgid "Failed to access `%s': %s\n"
+msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:427
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
-msgid "Cannot extract metadata from a URI!\n"
+msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:818
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr ""
+msgid "Unknown command `%s'\n"
+msgstr "Commande « %s » inconnue\n"
 
-#: src/fs/gnunet-publish.c:824
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, c-format
-msgid "You must NOT specify an URI and a filename.\n"
+msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:907
-msgid "enable adding the creation time to the metadata of the uploaded file"
+#: src/contrib/service/conversation/gnunet-conversation.c:548
+#, c-format
+msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/contrib/service/conversation/gnunet-conversation.c:607
+#, c-format
+msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:921
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/contrib/service/conversation/gnunet-conversation.c:622
+#, c-format
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:928
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/contrib/service/conversation/gnunet-conversation.c:649
+msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/contrib/service/conversation/gnunet-conversation.c:673
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+#: src/contrib/service/conversation/gnunet-conversation.c:680
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:953
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:965
+#: src/contrib/service/conversation/gnunet-conversation.c:696
+#, c-format
 msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:972
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/contrib/service/conversation/gnunet-conversation.c:705
+#, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:980
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/contrib/service/conversation/gnunet-conversation.c:711
+#, c-format
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:998
-msgid "Publish a file or directory on GNUnet"
+#: src/contrib/service/conversation/gnunet-conversation.c:728
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:446
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
+msgid "#%u: `%s'\n"
+msgstr "#%u : « %s »\n"
 
-#: src/fs/gnunet-search.c:535
-#, c-format
-msgid "Error searching: %s.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
+msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
+msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:602
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
+msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:608
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
-msgid "An output file is mandatory for silent mode.\n"
+msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:629
-msgid "Could not create keyword URI from arguments.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:858
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:891
+msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:662
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
+msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:676
-msgid "Could not start searching.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:914
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:702
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+#: src/contrib/service/conversation/gnunet-conversation.c:941
+msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
+#: src/contrib/service/conversation/gnunet-conversation.c:942
+msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
+#: src/contrib/service/conversation/gnunet-conversation.c:945
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
+#: src/contrib/service/conversation/gnunet-conversation.c:948
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/fs/gnunet-search.c:733
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
+#: src/contrib/service/conversation/gnunet-conversation.c:955
+msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
+#: src/contrib/service/conversation/gnunet-conversation.c:958
+msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
+#: src/contrib/service/conversation/gnunet-conversation.c:961
+msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
+#: src/contrib/service/conversation/gnunet-conversation.c:964
+msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/fs/gnunet-search.c:776
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-msgid "Search for files that have been published on GNUnet\n"
+msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
-msgid "# client searches active"
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
+#, c-format
+msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:423
-msgid "# replies received for local clients"
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
+msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
-msgid "# Loopback routes suppressed"
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:785
-msgid "# client searches received"
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
+msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:825
-msgid "# client searches updated (merged content seen list)"
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
+msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:1237
-msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr ""
+msgid "pa_stream_write() failed: %s\n"
+msgstr "pa_stream_write() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
-msgid "# replies received via cadet"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
-msgid "# replies received via cadet dropped"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
+msgid "Connection established.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
-msgid "# queries received via CADET not answered"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
+#, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "pa_stream_new() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
-msgid "# Blocks transferred via cadet"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr "pa_stream_connect_playback() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
-msgid "# queries received via cadet"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
+#, c-format
+msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
-msgid "# cadet client connections rejected"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
+msgid "Wrong Spec\n"
+msgstr "Spécification incorrecte\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
-#, fuzzy
-msgid "# cadet connections active"
-msgstr "# Session TCP active"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
+msgid "pa_mainloop_new() failed.\n"
+msgstr "pa_mainloop_new() échoué.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:539
-msgid "# migration stop messages received"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
+msgid "pa_context_new() failed.\n"
+msgstr "pa_context_new() échoué.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
-msgid "# P2P searches active"
-msgstr ""
+msgid "pa_context_connect() failed: %s\n"
+msgstr "pa_context_connect() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:671
-msgid "# artificial delays introduced (ms)"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
+msgid "pa_mainloop_run() failed.\n"
+msgstr "pa_mainloop_run() échoué.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:868
-msgid "# requests done for free (low load)"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
+#, c-format
+msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
-msgid "# request dropped, priority insufficient"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
+#, c-format
+msgid "opus_encode_float() failed: %s. Aborting\n"
+msgstr "opus_encode_float() échoué : %s. Annulation\n"
 
-#: src/fs/gnunet-service-fs_cp.c:903
-msgid "# requests done for a price (normal load)"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
+#, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "pa_stream_peek() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1000
-msgid "# requests dropped due to higher-TTL request"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
+msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1058
-msgid "# GET requests received (from other peers)"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
+msgid "Stream successfully created.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1082
-msgid "# requests dropped due to missing reverse route"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
+#, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "pa_stream_get_buffer_attr() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1096
-msgid "# requests dropped due to full reply queue"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1153
-msgid "# requests dropped due TTL underflow"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1197
-msgid "# P2P query messages received and processed"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
+#, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1541
-msgid "# migration stop messages sent"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
+#, c-format
+msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, c-format
-msgid "Could not open `%s'.\n"
-msgstr "Impossible d’ouvrir « %s ».\n"
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr "pa_stream_connect_record() échoué : %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
-#, c-format
-msgid "Error writing `%s'.\n"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
+msgid "ogg_stream_init() failed.\n"
+msgstr "ogg_stream_init() échoué.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:296
-msgid "# index blocks removed: original file inaccessible"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgid "Could not open line, port %s already in use!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:314
-msgid "not indexed"
-msgstr "non indexé"
+#: src/contrib/service/conversation/microphone.c:118
+msgid "Could not start record audio helper\n"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:260
-msgid "# average retransmission delay (ms)"
+#: src/contrib/service/conversation/speaker.c:73
+msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:422
-msgid "# delay heap timeout (ms)"
-msgstr ""
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
+#, fuzzy
+msgid "number of peers to start"
+msgstr "nombre de valeurs"
 
-#: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query plans executed"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:462
-msgid "# query messages sent to other peers"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
+msgid "timeout for the profiling"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:530
-msgid "# requests merged"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
+msgid "number of PeerIDs to request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:540
-msgid "# requests refreshed"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
-msgid "# query plan entries"
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:305
-msgid "# Pending requests created"
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
-msgid "# Pending requests active"
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:795
-msgid "# replies received and matched"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
+msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:869
-msgid "# results found locally"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
-msgid "# Datastore `PUT' failures"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1032
-msgid "# storage requests dropped due to high load"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1073
-msgid "# Replies received from DHT"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, c-format
+msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1228
-msgid "# Replies received from CADET"
-msgstr ""
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
 #, c-format
-msgid "Datastore lookup already took %s!\n"
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1304
-#, c-format
-msgid "On-demand lookup already took %s!\n"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1433
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1488
-msgid "# Datastore lookups concluded (no results)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1503
-msgid "# Datastore lookups concluded (seen all)"
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
+msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1526
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
-msgid "# on-demand blocks matched requests"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
+msgid "number of peers in consensus"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
-msgid "# on-demand lookups performed successfully"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1570
-msgid "# on-demand lookups failed"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1616
-msgid "# Datastore lookups concluded (found last result)"
-msgstr ""
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr "threshold"
 
-#: src/fs/gnunet-service-fs_pr.c:1629
-msgid "# Datastore lookups concluded (load too high)"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
-msgid "# Datastore lookups initiated"
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
+msgid "Could not connect to CADET service\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1744
-msgid "# GAP PUT messages received"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:643
-msgid "time required, content pushing disabled"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+msgid "number of element in set B-A"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:103
-#, c-format
-msgid "Error unindexing: %s.\n"
-msgstr ""
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr "numéro de hash"
 
-#: src/fs/gnunet-unindex.c:109
-msgid "Unindexing done.\n"
-msgstr ""
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr "taille ibz"
 
-#: src/fs/gnunet-unindex.c:142
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr ""
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+msgid "number of values"
+msgstr "nombre de valeurs"
 
-#: src/fs/gnunet-unindex.c:162
-msgid "Could not start unindex operation.\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
 msgstr ""
 
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
-msgid "metadata length"
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
 msgstr ""
 
-#: src/fs/meta_data.c:1092
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/fs/meta_data.c:1124
-#, c-format
-msgid "Serialized %ld bytes of metadata"
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
 msgstr ""
 
-#: src/fs/meta_data.c:1131
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Échec du démarrage de %s\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "%.s Code d'erreur inconnu"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
 msgid "Communication with service failed."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "upnpc introuvable\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "%.s Code d'erreur inconnu"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# Session TCP active"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "upnpc introuvable\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "upnpc introuvable\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Échec du démarrage de %s\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
 msgid "No records given."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
 msgid "No label given."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "# résultats introuvables"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Échec du démarrage de %s\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/gns/gns_tld_api.c:292
-msgid "Expected a base32-encoded public zone key\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
-#, fuzzy, c-format
-msgid "Invalid port number %u\n"
-msgstr "Argument invalide « %s »\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
-msgid "Unable to set up the daemon\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
-msgid "Failed to start HTTP server\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:660
-msgid "Run HTTP server on port PORT (default is 8888)"
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
-msgid "GNUnet HTTP server to create business cards"
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
-msgid "Failed to pack DNS response into UDP packet!\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:377
-#, fuzzy
-msgid "Failed to parse DNS response!\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
 #, c-format
-msgid "VPN returned empty result for `%s'\n"
+msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/lib/hello/gnunet-hello.c:310
 #, c-format
-msgid "Cannot parse DNS request from %s\n"
+msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/lib/hello/gnunet-hello.c:315
 #, c-format
-msgid "Received malformed DNS request from %s\n"
+msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
 #, c-format
-msgid "Received unsupported DNS request from %s\n"
+msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:839
-msgid "No DNS server specified!\n"
+#: src/lib/hello/gnunet-hello.c:339
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:999
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/lib/hello/gnunet-hello.c:386
+#, c-format
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1016
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/lib/hello/gnunet-hello.c:395
+#, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
-msgid "how long to wait between queries"
+#: src/lib/hello/gnunet-hello.c:409
+msgid "Hello file to read"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
-msgid "how long to wait for an answer"
+#: src/lib/hello/gnunet-hello.c:418
+msgid "Print information about peers."
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
-msgid "look for GNS2DNS records instead of ANY"
+#: src/lib/hello/hello.c:1089
+msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
-msgid "This program will import some GNS authorities into your GNS namestore."
+#: src/lib/hello/hello.c:1099
+msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+#: src/lib/hello/hello.c:1109
+msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:979
-#, c-format
-msgid "Unsupported CURL TLS backend %d\n"
+#: src/lib/hello/hello.c:1121
+msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/lib/hello/hello.c:1139
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr "Extension « %s » introuvable\n"
+
+#: src/lib/hello/hello.c:1147
 #, c-format
-msgid "Failed to fetch CN from cert: %s\n"
+msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/lib/hello/hello.c:1162
 #, c-format
-msgid "Failed to initialize DANE: %s\n"
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/lib/sq/sq.c:47
 #, c-format
-msgid "Failed to parse DANE record: %s\n"
+msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1056
-#, c-format
-msgid "Failed to verify TLS connection using DANE: %s\n"
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/lib/sq/sq.c:126
 #, c-format
-msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
-#, c-format
-msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr "Fin de fichier"
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/lib/util/bio.c:312
 #, c-format
-msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgid "Invalid handle type while reading `%s'"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
-#, c-format
-msgid "Unsupported HTTP method `%s'\n"
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/lib/util/bio.c:345
 #, c-format
-msgid "Unable to import private key from file `%s'\n"
+msgid "%s (while reading `%s')"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/lib/util/bio.c:350
 #, c-format
-msgid "Unable to import certificate from `%s'\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/lib/util/bio.c:363
 #, c-format
-msgid "Failed to start HTTPS server for `%s'\n"
+msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
-msgid "Failed to pass client to MHD\n"
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/lib/util/bio.c:773
 #, c-format
-msgid "Unsupported socks version %d\n"
+msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
 #, c-format
-msgid "Unsupported socks command %d\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
 #, c-format
-msgid "Unsupported socks address type %d\n"
+msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3726
-#, c-format
-msgid "Failed to load X.509 key and certificate from `%s'\n"
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3868
-msgid "listen on specified port (default: 7777)"
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3873
-msgid "pem file to use as CA"
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3877
-msgid "disable use of IPv6"
+#: src/lib/util/common_logging.c:910
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
-msgid "GNUnet GNS proxy"
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "ERREUR"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "AVERTISSEMENT"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "INFO"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr "AUCUN"
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr "INVALIDE"
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr "adresse inconnue"
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr "adresse invalide"
+
+#: src/lib/util/common_logging.c:1416
 #, c-format
-msgid "`%s' is not a valid DNS domain name\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
+#: src/lib/util/common_logging.c:1431
 #, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+#: src/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/lib/util/configuration.c:1718
+msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:304
+#: src/lib/util/configuration.c:1788
 #, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
+#: src/lib/util/configuration_helper.c:148
+#, c-format
+msgid "%s, %s or %s argument is required\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351
-msgid "Specify a timeout for the lookup"
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
+#: src/lib/util/configuration_helper.c:263
+#, c-format
+msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374
-msgid "GNUnet GNS resolver tool"
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:518
-msgid "Properly base32-encoded public key required"
+#: src/lib/util/crypto_ecc.c:554
+#, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
-msgid "Failed to connect to the namecache!\n"
+#: src/lib/util/crypto_ecc.c:677
+#, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
-msgid "Could not connect to DHT!\n"
+#: src/lib/util/crypto_ecc_setup.c:282
+msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
-msgid "Error converting GNS response to DNS response!\n"
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
-msgid "Failed to connect to the DNS service!\n"
+#: src/lib/util/crypto_rsa.c:908
+#, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/lib/util/crypto_rsa.c:1208
 #, c-format
-msgid "Protocol `%s' unknown, skipping labels.\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/lib/util/disk.c:843
 #, c-format
-msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
 #, c-format
-msgid "Service `%s' not a port, skipping service labels.\n"
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:900
-msgid "Failed to parse DNS response\n"
+#: src/lib/util/dnsparser.c:910
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/lib/util/dnsstub.c:228
 #, c-format
-msgid "Skipping record of unsupported type %d\n"
+msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/lib/util/dnsstub.c:371
 #, c-format
-msgid "Name `%s' cannot be converted to IDNA."
+msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/lib/util/dnsstub.c:509
 #, c-format
-msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/lib/util/getopt.c:566
 #, c-format
-msgid "GNS lookup failed (zero records found for `%s')\n"
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
-msgid "Unable to process critical delegation record\n"
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
-msgid "GNS lookup recursion failed (no delegation record found)\n"
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
 #, c-format
-msgid "Failed to cache GNS resolution: %s\n"
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/lib/util/getopt.c:648
 #, c-format
-msgid "GNS namecache returned empty result for `%s'\n"
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/lib/util/getopt.c:654
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:176
+#: src/lib/util/getopt.c:683
 #, c-format
-msgid "Unable to parse zone key record `%s'\n"
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:213
+#: src/lib/util/getopt.c:762
 #, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:230
+#: src/lib/util/getopt.c:782
 #, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:254
+#: src/lib/util/getopt.c:971
 #, c-format
-msgid "Unable to parse VPN record string `%s'\n"
+msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:286
+#: src/lib/util/getopt.c:984
 #, c-format
-msgid "Unable to parse BOX record string `%s'\n"
+msgid "Option `%s' can't be used with other options.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:450
-msgid "Gns REST API initialized\n"
+#: src/lib/util/getopt.c:996
+#, c-format
+msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
+#: src/lib/util/getopt_helpers.c:463
+msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
+#: src/lib/util/getopt_helpers.c:571
+#, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
+#: src/lib/util/getopt_helpers.c:578
 #, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
+msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
+#: src/lib/util/getopt_helpers.c:632
 #, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
+msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
+#: src/lib/util/getopt_helpers.c:686
 #, c-format
-msgid "Unable to parse SOA record `%s'\n"
+msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
+#: src/lib/util/getopt_helpers.c:743
 #, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
+#: src/lib/util/getopt_helpers.c:750
 #, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
+msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
+#: src/lib/util/getopt_helpers.c:806
 #, c-format
-msgid "Unable to parse MX record `%s'\n"
+msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
+#: src/lib/util/getopt_helpers.c:876
 #, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
+msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
+#: src/lib/util/getopt_helpers.c:954
 #, c-format
-msgid "Unable to parse SRV record `%s'\n"
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
+#: src/lib/util/helper.c:304
 #, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
+msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
+#: src/lib/util/helper.c:356
 #, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
+msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
+#: src/lib/util/helper.c:571
 #, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
+msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
+#: src/lib/util/network.c:163
 #, c-format
-msgid "Unable to parse CAA record string `%s'\n"
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:303
+#: src/lib/util/network.c:1284
 #, c-format
-msgid "Error accessing file `%s': %s\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:310
+#: src/lib/util/os_installation.c:416
 #, c-format
-msgid "File `%s' is too big to be a HELLO\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:315
+#: src/lib/util/os_installation.c:787
 #, c-format
-msgid "File `%s' is too small to be a HELLO\n"
+msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
+#: src/lib/util/os_installation.c:820
 #, c-format
-msgid "Error opening file `%s': %s\n"
+msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:339
+#: src/lib/util/plugin.c:87
 #, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
+msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:386
+#: src/lib/util/plugin.c:158
 #, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:395
+#: src/lib/util/plugin.c:215
 #, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:409
-msgid "Hello file to read"
+#: src/lib/util/plugin.c:371
+msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:418
-msgid "Print information about peers."
+#: src/lib/util/program.c:287
+#, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
 msgstr ""
 
-#: src/hello/hello.c:1089
-msgid "Failed to parse HELLO message: missing expiration time\n"
+#: src/lib/util/program.c:299
+#, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr ""
 
-#: src/hello/hello.c:1099
-msgid "Failed to parse HELLO message: invalid expiration time\n"
+#: src/lib/util/program.c:314
+#, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
 msgstr ""
 
-#: src/hello/hello.c:1109
-msgid "Failed to parse HELLO message: malformed\n"
+#: src/lib/util/program.c:329
+msgid "Malformed configuration. Exiting ...\n"
 msgstr ""
 
-#: src/hello/hello.c:1121
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr ""
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr "Masque érroné : %d\n"
 
-#: src/hello/hello.c:1139
-#, fuzzy, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr "Extension « %s » introuvable\n"
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
 
-#: src/hello/hello.c:1147
+#: src/lib/util/resolver_api.c:243
 #, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 
-#: src/hello/hello.c:1162
+#: src/lib/util/resolver_api.c:888
 #, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:306
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/lib/util/resolver_api.c:901
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
-msgid "advertise our hostlist to other peers"
+#: src/lib/util/resolver_api.c:1086
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/lib/util/service.c:654
+#, c-format
 msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
-msgid "enable learning about hostlist servers from other peers"
+#: src/lib/util/service.c:838
+#, c-format
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
-msgid "provide a hostlist server"
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
-msgid "GNUnet hostlist server and client"
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
-msgid "# bytes downloaded from hostlist servers"
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr ""
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
-msgid "# advertised hostlist URIs"
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/lib/util/service.c:1401
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/lib/util/service.c:1413
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/lib/util/service.c:1420
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/lib/util/service.c:1481
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/lib/util/service.c:1505
 #, c-format
-msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
-#, c-format
-msgid "Download of hostlist `%s' completed.\n"
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr "Aucun utilisateur trouvé"
+
+#: src/lib/util/service.c:1658
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
-#, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
-msgid "# hostlist downloads initiated"
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
-msgid "# milliseconds between hostlist downloads"
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
+msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
-msgid "# active connections"
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/lib/util/socks.c:636
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/lib/util/socks.c:653
 #, c-format
-msgid "Hostlist file `%s' does not exist\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/lib/util/strings.c:394
 #, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1081
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
-msgid "# hostlist URIs read from file"
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/lib/util/strings.c:1283
 #, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/lib/util/strings.c:1408
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
-msgid "# hostlist URIs written to file"
+#: src/lib/util/strings.c:1459
+#, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/lib/util/strings.c:1551
 #, c-format
-msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
-msgid "Learning is enabled on this peer\n"
+#: src/lib/util/strings.c:1582
+#, c-format
+msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
-msgid "Learning is not enabled on this peer\n"
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/lib/util/time.c:937
 #, c-format
 msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
-msgid "bytes in hostlist"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
 #, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
+msgid "Unable to parse zone key record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-msgid "Expired HELLO encountered (ignored)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
-msgid "bytes not included in hostlist (size limit)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
-msgid "hostlist requests refused (not HTTP GET)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, c-format
+msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
-msgid "hostlist requests refused (upload data)"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
-msgid "hostlist requests refused (not ready)"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
-msgid "Received request for our hostlist\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
-msgid "hostlist requests processed"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, c-format
+msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
-msgid "# hostlist advertisements send"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
-msgid "Could not access PEERSTORE service.  Exiting.\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Unable to parse SRV record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
 #, c-format
-msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
 #, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgid "Unable to parse CAA record string `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid "Unable to initialize file: %s.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:225
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
 #, c-format
-msgid "Failed to create ego: %s\n"
+msgid "Unable to get filesize: %s.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+msgid "flat plugin running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+msgid "Flat file database running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:576
-#, fuzzy
-msgid "reduce output"
-msgstr "sortie verbeuse"
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+msgid "SQlite database running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:597
-msgid "display private keys as well"
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
-#, c-format
-msgid "Failed to write subsystem default identifier map to `%s'.\n"
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:921
-#, c-format
-msgid "Failed to parse ego information in `%s'\n"
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+msgid "CONFIG REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:979
-#, c-format
-msgid "Failed to parse subsystem identity configuration file `%s'\n"
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+msgid "COPYING REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/arm/gnunet-service-arm.c:391
 #, c-format
-msgid "Failed to create directory `%s' for storing egos\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1245
-msgid "Identity REST API initialized\n"
+#: src/service/arm/gnunet-service-arm.c:951
+#, c-format
+msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Résolution de « %s » échouée : %s\n"
+#: src/service/arm/gnunet-service-arm.c:962
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr ""
 
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/arm/gnunet-service-arm.c:1062
 #, c-format
-msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/arm/gnunet-service-arm.c:1093
 #, c-format
-msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:105
+#: src/service/arm/gnunet-service-arm.c:1124
 #, c-format
-msgid "No records found for `%s'"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
+#: src/service/arm/gnunet-service-arm.c:1272
 #, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:174
+#: src/service/arm/gnunet-service-arm.c:1604
 #, c-format
-msgid "You must specify which zone should be accessed\n"
+msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "fornat invalide : « %s »\n"
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr "exit"
 
-#: src/namecache/gnunet-namecache.c:187
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr "signal"
+
+#: src/service/arm/gnunet-service-arm.c:1765
+msgid "unknown"
+msgstr "inconnu"
+
+#: src/service/arm/gnunet-service-arm.c:1771
 #, c-format
-msgid "You must specify a name\n"
+msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
+#: src/service/arm/gnunet-service-arm.c:1798
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:220
-msgid "specifies the public key of the zone to look in"
+#: src/service/arm/gnunet-service-arm.c:1815
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-msgid "GNUnet zone manipulation tool"
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/namecache/namecache_api.c:283
-msgid "Namecache failed to cache block"
+#: src/service/core/gnunet-service-core.c:329
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/namecache/namecache_api.c:371
-msgid "Error communicating with namecache service"
+#: src/service/core/gnunet-service-core.c:355
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
+#: src/service/core/gnunet-service-core.c:419
 #, c-format
-msgid "Unable to initialize file: %s.\n"
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, c-format
-msgid "Unable to get filesize: %s.\n"
+#: src/service/core/gnunet-service-core.c:505
+msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/namecache/plugin_namecache_flat.c:404
-msgid "flat plugin running\n"
+#: src/service/core/gnunet-service-core.c:824
+#, c-format
+msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core.c:926
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
+#: src/service/core/gnunet-service-core.c:954
 #, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
+#: src/service/core/gnunet-service-core_kx.c:511
+msgid "# bytes encrypted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
+#: src/service/core/gnunet-service-core_kx.c:569
+msgid "# bytes decrypted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
+#: src/service/core/gnunet-service-core_kx.c:666
+msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-msgid "GNUnet namestore database manipulation tool"
+#: src/service/core/gnunet-service-core_kx.c:718
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-msgid "can not search the namestore"
+#: src/service/core/gnunet-service-core_kx.c:774
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-msgid "unable to scan namestore"
+#: src/service/core/gnunet-service-core_kx.c:806
+msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
+#: src/service/core/gnunet-service-core_kx.c:865
+msgid "# old ephemeral keys ignored"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "erreur unconnue."
+#: src/service/core/gnunet-service-core_kx.c:880
+msgid "# duplicate ephemeral keys ignored"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/core/gnunet-service-core_kx.c:917
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr ""
+
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
-msgid "The requested key `%s' exists as `%s'\n"
+msgid ""
+"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
+#: src/service/core/gnunet-service-core_kx.c:943
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "Erreur de création du tunnel\n"
+#: src/service/core/gnunet-service-core_kx.c:962
+msgid "# valid ephemeral keys received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "suprimer un enregistrement"
+#: src/service/core/gnunet-service-core_kx.c:1072
+msgid "# PING messages received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
-#, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
+#: src/service/core/gnunet-service-core_kx.c:1082
+msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
+#: src/service/core/gnunet-service-core_kx.c:1134
+msgid "# PONG messages created"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
+#: src/service/core/gnunet-service-core_kx.c:1159
+msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
+#: src/service/core/gnunet-service-core_kx.c:1172
+msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "adresse invalide"
+#: src/service/core/gnunet-service-core_kx.c:1229
+msgid "# PONG messages received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "adresse invalide"
+#: src/service/core/gnunet-service-core_kx.c:1237
+msgid "# PONG messages dropped (connection down)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core_kx.c:1246
+msgid "# PONG messages dropped (out of order)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-msgid "unable to parse key"
+#: src/service/core/gnunet-service-core_kx.c:1288
+msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/service/core/gnunet-service-core_kx.c:1331
+msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-msgid "No expiration specified for records.\n"
+#: src/service/core/gnunet-service-core_kx.c:1343
+msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-msgid "No port specified, using default value\n"
+#: src/service/core/gnunet-service-core_kx.c:1352
+msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-msgid "Failed to connect to identity\n"
+#: src/service/core/gnunet-service-core_kx.c:1521
+msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
+#: src/service/core/gnunet-service-core_kx.c:1533
+#, c-format
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
+#: src/service/core/gnunet-service-core_kx.c:1537
+msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
+msgid "# bytes dropped (duplicates)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, c-format
-msgid "Name `%s' is too long\n"
+#: src/service/core/gnunet-service-core_kx.c:1632
+msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core_kx.c:1679
+msgid "# bytes dropped (ancient message)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core_kx.c:1689
+msgid "# bytes of payload decrypted"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
+msgid "# peers connected"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/service/core/gnunet-service-core_sessions.c:285
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Appel terminé\n"
+#: src/service/core/gnunet-service-core_sessions.c:400
+msgid "# outdated typemap confirmations received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core_sessions.c:418
+msgid "# valid typemap confirmations received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
+msgid "# type maps received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-msgid "name of the ego controlling the zone"
+#: src/service/core/gnunet-service-core_typemap.c:217
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:411
-#, c-format
-msgid "Missing entries in record line `%s'.\n"
+#: src/service/datacache/plugin_datacache_heap.c:492
+msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Commande « %s » inconnue\n"
+#: src/service/datastore/datastore_api.c:340
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "Déconnecté de"
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/service/datastore/datastore_api.c:462
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "Déconnecté de"
+
+#: src/service/datastore/datastore_api.c:565
+msgid "# queue overflows"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, c-format
-msgid "Error parsing expiration time %s.\n"
+#: src/service/datastore/datastore_api.c:595
+msgid "# queue entries created"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "fornat invalide : « %s »\n"
+#: src/service/datastore/datastore_api.c:756
+msgid "# status messages received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "Adding record failed: %s\n"
+#: src/service/datastore/datastore_api.c:810
+msgid "# Results received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Résolution de « %s » échouée\n"
+#: src/service/datastore/datastore_api.c:917
+msgid "# datastore connections (re)created"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
+#: src/service/datastore/datastore_api.c:1007
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1259
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+#: src/service/datastore/datastore_api.c:1068
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+#: src/service/datastore/datastore_api.c:1113
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
+#: src/service/datastore/datastore_api.c:1171
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
+#: src/service/datastore/datastore_api.c:1230
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
+#: src/service/datastore/datastore_api.c:1276
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, c-format
-msgid "Missing option `%s' for operation `%s'\n"
+#: src/service/datastore/datastore_api.c:1357
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1381
-msgid "name"
+#: src/service/datastore/gnunet-service-datastore.c:335
+msgid "# bytes expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1410
-#, c-format
-msgid "Invalid nick `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:419
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr "ajouter"
+#: src/service/datastore/gnunet-service-datastore.c:551
+msgid "# results found"
+msgstr "# résultats introuvables"
 
-#: src/namestore/gnunet-namestore.c:1461
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, c-format
-msgid "Unsupported type `%s'\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1471
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1491
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:612
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, c-format
-msgid "Invalid time format `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:619
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr "supprimer"
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
+msgid "# reserved"
+msgstr "# réservé"
 
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
+#: src/service/datastore/gnunet-service-datastore.c:693
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
+#: src/service/datastore/gnunet-service-datastore.c:743
+msgid "# bytes stored"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
+#: src/service/datastore/gnunet-service-datastore.c:758
+#, c-format
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:858
+msgid "# GET requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
+#: src/service/datastore/gnunet-service-datastore.c:888
+msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
-#, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "URI invalide « %s »\n"
+#: src/service/datastore/gnunet-service-datastore.c:899
+msgid "# requests filtered by bloomfilter"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1967
-#, c-format
-msgid "Cannot connect to identity service\n"
+#: src/service/datastore/gnunet-service-datastore.c:940
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr "ajouter un enregistrement"
+#: src/service/datastore/gnunet-service-datastore.c:971
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr "suprimer un enregistrement"
+#: src/service/datastore/gnunet-service-datastore.c:1012
+msgid "Content not found"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr "afficher les enregistrements"
+#: src/service/datastore/gnunet-service-datastore.c:1019
+msgid "# bytes removed (explicit request)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
+#: src/service/datastore/gnunet-service-datastore.c:1058
+msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2004
+#: src/service/datastore/gnunet-service-datastore.c:1107
+#, c-format
 msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2010
-msgid "set the desired nick name for the zone"
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
+#, c-format
+msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2015
-msgid "monitor changes in the namestore"
+#: src/service/datastore/gnunet-service-datastore.c:1167
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2025
-msgid "Output in recordline format"
+#: src/service/datastore/gnunet-service-datastore.c:1176
+#, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2031
-msgid "determine our name for the given KEY"
+#: src/service/datastore/gnunet-service-datastore.c:1236
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
+#: src/service/datastore/gnunet-service-datastore.c:1288
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
+#: src/service/datastore/gnunet-service-datastore.c:1298
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
+#: src/service/datastore/gnunet-service-datastore.c:1463
+#, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
+#: src/service/datastore/gnunet-service-datastore.c:1472
+msgid "# quota"
+msgstr "# quota"
+
+#: src/service/datastore/gnunet-service-datastore.c:1475
+msgid "# cache size"
+msgstr "# taille du cache"
+
+#: src/service/datastore/gnunet-service-datastore.c:1491
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2056
-#, fuzzy
-msgid "omit private records"
-msgstr "afficher les enregistrements"
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
+#, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
+#: src/service/datastore/gnunet-service-datastore.c:1573
+msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
+#: src/service/datastore/plugin_datastore_heap.c:895
+msgid "Heap database running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
+msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
+#: src/service/datastore/plugin_datastore_postgres.c:811
+msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+#: src/service/datastore/plugin_datastore_sqlite.c:87
+#, c-format
+msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
+#: src/service/datastore/plugin_datastore_sqlite.c:634
+msgid "sqlite bind failure"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
+#: src/service/datastore/plugin_datastore_sqlite.c:675
+msgid "Data too large"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:195
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
+msgid "sqlite version to old to determine size, assuming zero\n"
+msgstr ""
+
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
+#, fuzzy
+msgid "error preparing statement\n"
+msgstr "Erreur de création du tunnel\n"
+
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
+msgid "error stepping\n"
+msgstr ""
+
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
-msgid "File too big to map: %llu bytes.\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:219
+#: src/service/datastore/plugin_datastore_template.c:252
+msgid "Template database running\n"
+msgstr ""
+
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, c-format
-msgid "Namestore database file `%s' malformed\n"
+msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:792
-msgid "Flat file database running\n"
+#: src/service/dht/gnunet_dht_profiler.c:964
+msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
+msgid "name of the file with the login information for the testbed"
+msgstr ""
 
-#: src/namestore/plugin_namestore_sqlite.c:956
-msgid "SQlite database running\n"
+#: src/service/dht/gnunet_dht_profiler.c:976
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1320
-msgid "Namestore REST API initialized\n"
+#: src/service/dht/gnunet_dht_profiler.c:982
+msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:189
-msgid "Suggested configuration changes:\n"
+#: src/service/dht/gnunet_dht_profiler.c:988
+msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Résolution de « %s » échouée\n"
+#: src/service/dht/gnunet_dht_profiler.c:993
+msgid "replication degree for DHT PUTs"
+msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, c-format
-msgid "Wrote updated configuration to `%s'\n"
+#: src/service/dht/gnunet_dht_profiler.c:999
+msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:327
-msgid "run autoconfiguration"
+#: src/service/dht/gnunet_dht_profiler.c:1005
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
+#: src/service/dht/gnunet_dht_profiler.c:1026
+msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
+#: src/service/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "write configuration file (for autoconfiguration)"
+#: src/service/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:355
-msgid "GNUnet NAT traversal autoconfiguration"
+#: src/service/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/service/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+#: src/service/dns/gnunet-service-dns.c:463
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
-msgid "NAT test failed to start NAT library\n"
+#: src/service/dns/gnunet-service-dns.c:617
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
-msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+#: src/service/dns/gnunet-service-dns.c:753
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
-msgid "NAT traversal with ICMP Server succeeded.\n"
+#: src/service/dns/gnunet-service-dns.c:829
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
-msgid "NAT traversal with ICMP Server failed.\n"
+#: src/service/dns/gnunet-service-dns.c:951
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
-msgid "Testing connection reversal with ICMP server.\n"
+#: src/service/dns/gnunet-service-dns.c:970
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
-msgid "Detected external IP `%s'\n"
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/service/dns/gnunet-service-dns.c:993
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/service/dns/gnunet-service-dns.c:996
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
-msgid "upnpc found, enabling its use\n"
+#: src/service/dns/gnunet-service-dns.c:1066
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
-msgid "upnpc not found\n"
-msgstr "upnpc introuvable\n"
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/service/dns/gnunet-service-dns.c:1125
+#, c-format
+msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/service/exit/gnunet-daemon-exit.c:968
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/service/exit/gnunet-daemon-exit.c:1074
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/service/exit/gnunet-daemon-exit.c:1368
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
-msgid "Operation Successful"
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
+msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
-msgid "IPC failure"
+#: src/service/exit/gnunet-daemon-exit.c:1504
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
-msgid "Failure in network subsystem, check permissions."
+#: src/service/exit/gnunet-daemon-exit.c:1616
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
-msgid "Encountered timeout while performing operation"
+#: src/service/exit/gnunet-daemon-exit.c:1658
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
-msgid "detected that we are offline"
+#: src/service/exit/gnunet-daemon-exit.c:1749
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
-msgid "`upnpc` command not found"
+#: src/service/exit/gnunet-daemon-exit.c:1837
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:91
-msgid "Failed to run `upnpc` command"
+#: src/service/exit/gnunet-daemon-exit.c:1876
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:94
-msgid "`upnpc' command took too long, process killed"
+#: src/service/exit/gnunet-daemon-exit.c:2017
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:97
-msgid "`upnpc' command failed to establish port mapping"
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
-msgid "`external-ip' command not found"
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:103
-msgid "Failed to run `external-ip` command"
+#: src/service/exit/gnunet-daemon-exit.c:2287
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:106
-msgid "`external-ip' command output invalid"
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:109
-msgid "no valid address was returned by `external-ip'"
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
-msgid "Could not determine interface with internal/local network address"
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
+msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:116
-msgid "No functioning gnunet-helper-nat-server installation found"
+#: src/service/exit/gnunet-daemon-exit.c:2616
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:119
-msgid "NAT test could not be initialized"
+#: src/service/exit/gnunet-daemon-exit.c:2636
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
-msgid "NAT test timeout reached"
+#: src/service/exit/gnunet-daemon-exit.c:2828
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
-msgid "could not register NAT"
+#: src/service/exit/gnunet-daemon-exit.c:2837
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
-msgid "No working gnunet-helper-nat-client installation found"
+#: src/service/exit/gnunet-daemon-exit.c:2913
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:445
-#, c-format
-msgid "Failed to find valid PORT in section `%s'\n"
+#: src/service/exit/gnunet-daemon-exit.c:2987
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:489
-#, fuzzy, c-format
-msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
+#: src/service/exit/gnunet-daemon-exit.c:3036
+msgid "# Packets received from TUN"
+msgstr ""
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
+#: src/service/exit/gnunet-daemon-exit.c:3051
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
+#: src/service/exit/gnunet-daemon-exit.c:3078
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
+#: src/service/exit/gnunet-daemon-exit.c:3109
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
+#: src/service/exit/gnunet-daemon-exit.c:3161
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
+#: src/service/exit/gnunet-daemon-exit.c:3170
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:464
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
+#, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
-msgid "Malformed punched hole specification `%s' (lacks port)\n"
+msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
-msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
-msgid "Malformed punched hole specification `%s' (lacks `]')\n"
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
-msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
-msgid "Connection reversal request failed\n"
+#: src/service/exit/gnunet-daemon-exit.c:3637
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
-"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP\n"
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+#: src/service/exit/gnunet-daemon-exit.c:3654
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/exit/gnunet-daemon-exit.c:3661
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
+msgstr ""
+
+#: src/service/exit/gnunet-daemon-exit.c:3832
+msgid "Must be a number"
+msgstr "Doit être un nombre"
+
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, c-format
-msgid "Failed to start %s\n"
-msgstr "Échec du démarrage de %s\n"
+msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
+msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:188
-msgid "`external-ip' command not found\n"
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:602
-msgid "`upnpc' command not found\n"
+#: src/service/exit/gnunet-daemon-exit.c:4114
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
-msgid "limit to the number of connections to NSE services, 0 for none"
+#: src/service/fs/fs_api.c:481
+#, c-format
+msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864
-msgid "name of the file for writing connection information and statistics"
+#: src/service/fs/fs_api.c:492
+#, c-format
+msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:879
-msgid "name of the file for writing the main results"
+#: src/service/fs/fs_api.c:500
+#, c-format
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:888
-msgid "Number of peers to run in each round, separated by commas"
+#: src/service/fs/fs_api.c:1157
+#, c-format
+msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
-msgid "delay between rounds"
+#: src/service/fs/fs_api.c:1708
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:912
-msgid "Measure quality and performance of the NSE service."
+#: src/service/fs/fs_api.c:1723
+#, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
+#: src/service/fs/fs_api.c:2452
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-msgid "Value is too large.\n"
+#: src/service/fs/fs_api.c:2463
+#, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/peerstore/gnunet-peerstore.c:92
-msgid "peerstore"
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
+#, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/fs/fs_api.c:2629
 #, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
+msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:657
-#, fuzzy, c-format
-msgid "Could not load database backend `%s'\n"
-msgstr "Impossible d’ouvrir « %s ».\n"
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
+msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/fs/fs_api.c:2847
 #, c-format
-msgid "Importing HELLOs from `%s'\n"
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:688
-msgid "Skipping import of included HELLOs\n"
+#: src/service/fs/fs_api.c:3108
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
-msgid "Unexpected iteration response, this should not happen.\n"
+#: src/service/fs/fs_directory.c:216
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:781
-msgid "Received a malformed response from service."
+#: src/service/fs/fs_download.c:311
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:895
-msgid "Received a watch result for a non existing watch.\n"
+#: src/service/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/fs/fs_download.c:347
 #, c-format
 msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
+"Failed to access full directory contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
+msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/fs/fs_download.c:961
 #, c-format
-msgid "Unable to create indices: %s.\n"
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:416
-msgid "Failed to pack DNS request.  Dropping.\n"
+#: src/service/fs/fs_download.c:1045
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %lu bytes at depth %u and "
+"offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:422
-msgid "# DNS requests mapped to VPN"
+#: src/service/fs/fs_download.c:1067
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:476
-msgid "# DNS records modified"
+#: src/service/fs/fs_download.c:1090
+#, c-format
+msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:671
-msgid "# DNS replies intercepted"
+#: src/service/fs/fs_download.c:1101
+#, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:678
-msgid "Failed to parse DNS request.  Dropping.\n"
+#: src/service/fs/fs_download.c:1111
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:716
-msgid "# DNS requests dropped (timeout)"
+#: src/service/fs/fs_download.c:1219
+msgid "internal error decoding tree"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:771
-msgid "# DNS requests intercepted"
-msgstr ""
+#: src/service/fs/fs_download.c:1890
+msgid "Invalid URI"
+msgstr "URI invalide"
 
-#: src/pt/gnunet-daemon-pt.c:777
-msgid "# DNS requests dropped (DNS cadet channel down)"
+#: src/service/fs/fs_getopt.c:237
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:786
-msgid "# DNS requests dropped (malformed)"
+#: src/service/fs/fs_list_indexed.c:191
+#, c-format
+msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:881
-msgid "# DNS replies received"
+#: src/service/fs/fs_misc.c:129
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898
-msgid "# DNS replies dropped (too late?)"
+#: src/service/fs/fs_namespace.c:203
+#, c-format
+msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/fs/fs_namespace.c:234
 #, c-format
-msgid "Failed to connect to %s service.  Exiting.\n"
+msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1314
-msgid "Daemon to run to perform IP protocol translation to GNUnet"
+#: src/service/fs/fs_namespace.c:331
+#, c-format
+msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
+#: src/service/fs/fs_namespace.c:458
+msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
+#, c-format
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
+#: src/service/fs/fs_publish.c:732
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
+#: src/service/fs/fs_publish.c:791
+msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
+#: src/service/fs/fs_publish.c:837
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
+#: src/service/fs/fs_publish.c:857
+msgid "filename too long"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
+#: src/service/fs/fs_publish.c:889
+msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
+#: src/service/fs/fs_publish.c:915
+#, c-format
+msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:805
+#: src/service/fs/fs_publish.c:1108
 #, c-format
-msgid "Ego is required\n"
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:812
+#: src/service/fs/fs_publish.c:1116
 #, c-format
-msgid "Attribute value missing!\n"
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:819
-#, c-format
-msgid "Requesting party key is required!\n"
+#: src/service/fs/fs_publish.c:1157
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
+#: src/service/fs/fs_publish.c:1397
+#, fuzzy, c-format
+msgid "Datastore failure: %s"
+msgstr "pa_stream_new() échoué : %s\n"
+
+#: src/service/fs/fs_publish.c:1489
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
+#: src/service/fs/fs_publish_ksk.c:213
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
+#: src/service/fs/fs_publish_ublock.c:215
+msgid "Internal error."
+msgstr "Erreur interne."
+
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
+#, c-format
+msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:852
-msgid "The EGO to use"
+#: src/service/fs/fs_search.c:994
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
+#: src/service/fs/fs_unindex.c:64
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
+#: src/service/fs/fs_unindex.c:69
+msgid "Failed to read file"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
+#: src/service/fs/fs_unindex.c:276
+msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
+#: src/service/fs/fs_unindex.c:327
+msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
+msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
+#: src/service/fs/fs_unindex.c:386
+#, c-format
+msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
+#: src/service/fs/fs_unindex.c:447
+#, c-format
+msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
+msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
+#: src/service/fs/fs_unindex.c:670
+msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
+#: src/service/fs/fs_unindex.c:709
+msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
+#: src/service/fs/fs_uri.c:232
+#, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
+#: src/service/fs/fs_uri.c:291
+msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
+#: src/service/fs/fs_uri.c:309
+msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-msgid "OpenID Connect REST API initialized\n"
+#: src/service/fs/fs_uri.c:316
+msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-msgid "Identity Provider REST API initialized\n"
+#: src/service/fs/fs_uri.c:383
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:544
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/service/fs/fs_uri.c:424
+msgid "Malformed CHK URI (wrong syntax)"
+msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
-#, c-format
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+#: src/service/fs/fs_uri.c:441
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
-msgid "Daemon to announce regular expressions for the peer using cadet."
+#: src/service/fs/fs_uri.c:518
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1365
-msgid "No configuration file given. Exiting\n"
+#: src/service/fs/fs_uri.c:535
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
-#, c-format
-msgid "No policy directory specified on command line. Exiting.\n"
+#: src/service/fs/fs_uri.c:545
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
+#: src/service/fs/fs_uri.c:553
+msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1421
-#, c-format
-msgid "No files found in `%s'\n"
+#: src/service/fs/fs_uri.c:562
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1430
-msgid "No search strings file given. Exiting.\n"
+#: src/service/fs/fs_uri.c:568
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1450
-msgid "Error loading search strings. Exiting.\n"
+#: src/service/fs/fs_uri.c:575
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1539
-msgid "name of the file for writing statistics"
+#: src/service/fs/fs_uri.c:586
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1546
-msgid "wait TIMEOUT before ending the experiment"
+#: src/service/fs/fs_uri.c:593
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1552
-msgid "directory with policy files"
+#: src/service/fs/fs_uri.c:599
+msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
-msgid "name of file with input strings"
+#: src/service/fs/fs_uri.c:613
+msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1566
-msgid "name of file with hosts' names"
+#: src/service/fs/fs_uri.c:646
+#, fuzzy
+msgid "invalid argument"
+msgstr "Argument invalide « %s »\n"
+
+#: src/service/fs/fs_uri.c:666
+msgid "Unrecognized URI type"
+msgstr "Type d’URI non reconnu"
+
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1581
-msgid "Profiler for regex"
+#: src/service/fs/fs_uri.c:1094
+msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
-msgid "name of the table to write DFAs"
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
+msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
-msgid "maximum path compression length"
+#: src/service/fs/gnunet-fs-profiler.c:211
+msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
-msgid "Profiler for regex library"
+#: src/service/fs/gnunet-fs-profiler.c:218
+msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:151
-#, c-format
-msgid "Regex `%s' is too long!\n"
+#: src/service/fs/gnunet-fs-profiler.c:225
+msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/regex/regex_api_search.c:200
-#, c-format
-msgid "Search string `%s' is too long!\n"
+#: src/service/fs/gnunet-fs-profiler.c:237
+msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:1369
-msgid "GNUnet REST server"
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
+msgid "# client searches active"
 msgstr ""
 
-#: src/rest/plugin_rest_config.c:428
-msgid "CONFIG REST API initialized\n"
+#: src/service/fs/gnunet-service-fs.c:423
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/rest/plugin_rest_copying.c:211
-msgid "COPYING REST API initialized\n"
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "En cous de démarrage %s…\n"
+#: src/service/fs/gnunet-service-fs.c:785
+msgid "# client searches received"
+msgstr ""
 
-#: src/revocation/gnunet-revocation.c:146
-#, c-format
-msgid "Key `%s' is valid\n"
+#: src/service/fs/gnunet-service-fs.c:825
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:150
+#: src/service/fs/gnunet-service-fs.c:995
 #, c-format
-msgid "Key `%s' has been revoked\n"
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:154
-msgid "Internal error\n"
+#: src/service/fs/gnunet-service-fs.c:1237
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:180
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
-msgid "Revocation failed (!)\n"
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
+msgid "# replies received via cadet"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
+msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
+msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
+msgid "# queries received via cadet"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
+msgid "# cadet client connections rejected"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:334
-#, c-format
-msgid "Ego `%s' not found.\n"
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# Session TCP active"
+
+#: src/service/fs/gnunet-service-fs_cp.c:539
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
-msgid "Error: Key is invalid\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
+#: src/service/fs/gnunet-service-fs_cp.c:671
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
+#: src/service/fs/gnunet-service-fs_cp.c:868
+msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
+#: src/service/fs/gnunet-service-fs_cp.c:893
+msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:424
-#, c-format
-msgid "Public key `%s' malformed\n"
+#: src/service/fs/gnunet-service-fs_cp.c:903
+msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1000
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:464
-msgid "No filename to store revocation certificate given.\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1058
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:481
-#, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1082
+msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:489
-#, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1096
+msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:511
-msgid "No action specified. Nothing to do.\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1153
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
+#: src/service/fs/gnunet-service-fs_cp.c:1197
+msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
+#: src/service/fs/gnunet-service-fs_cp.c:1541
+msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
+#, c-format
+msgid "Could not open `%s'.\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
+
+#: src/service/fs/gnunet-service-fs_indexing.c:146
+#, c-format
+msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
+#: src/service/fs/gnunet-service-fs_indexing.c:243
+#, c-format
+msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:558
-msgid "number of epochs to calculate for"
+#: src/service/fs/gnunet-service-fs_indexing.c:296
+msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:539
-msgid "# unsupported revocations received via set union"
+#: src/service/fs/gnunet-service-fs_indexing.c:310
+#, c-format
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:549
-msgid "# revocation messages received via set union"
+#: src/service/fs/gnunet-service-fs_indexing.c:314
+msgid "not indexed"
+msgstr "non indexé"
+
+#: src/service/fs/gnunet-service-fs_indexing.c:328
+#, c-format
+msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
-msgid "Error computing revocation set union with %s\n"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
-msgid "# revocation set unions failed"
+#: src/service/fs/gnunet-service-fs_pe.c:260
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:566
-msgid "# revocation set unions completed"
+#: src/service/fs/gnunet-service-fs_pe.c:422
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:604
-msgid "SET service crashed, terminating revocation service\n"
+#: src/service/fs/gnunet-service-fs_pe.c:433
+msgid "# query plans executed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
-msgid "Could not open revocation database file!"
+#: src/service/fs/gnunet-service-fs_pe.c:462
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
+#: src/service/fs/gnunet-service-fs_pe.c:530
+msgid "# requests merged"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3148
-msgid "timeout for the profiling"
+#: src/service/fs/gnunet-service-fs_pe.c:540
+msgid "# requests refreshed"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3153
-msgid "number of PeerIDs to request"
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
+msgid "# query plan entries"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3170
-msgid "Measure quality and performance of the RPS service."
+#: src/service/fs/gnunet-service-fs_pr.c:305
+msgid "# Pending requests created"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
+msgid "# Pending requests active"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
+#: src/service/fs/gnunet-service-fs_pr.c:795
+msgid "# replies received and matched"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
+#: src/service/fs/gnunet-service-fs_pr.c:869
+msgid "# results found locally"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-msgid "You must specify at least one message ID to check!\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1003
+msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1032
+msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1073
+msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1228
+msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:290
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
-msgid "Malformed input, could not parse `%s'\n"
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "Impossible d’ouvrir « %s ».\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
+#: src/service/fs/gnunet-service-fs_pr.c:1371
+msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
+#: src/service/fs/gnunet-service-fs_pr.c:1433
+msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
+#: src/service/fs/gnunet-service-fs_pr.c:1488
+msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
+#: src/service/fs/gnunet-service-fs_pr.c:1503
+msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-msgid "Connect to CADET failed\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1526
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1543
+msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-msgid "number of peers in consensus"
+#: src/service/fs/gnunet-service-fs_pr.c:1564
+msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
+#: src/service/fs/gnunet-service-fs_pr.c:1570
+msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
+#: src/service/fs/gnunet-service-fs_pr.c:1616
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr "threshold"
+#: src/service/fs/gnunet-service-fs_pr.c:1629
+msgid "# Datastore lookups concluded (load too high)"
+msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
+#: src/service/fs/gnunet-service-fs_pr.c:1680
+msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-msgid "Could not connect to CADET service\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1744
+msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-msgid "number of element in set A-B"
+#: src/service/fs/gnunet-service-fs_push.c:643
+msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-msgid "number of element in set B-A"
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
+msgid "metadata length"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
+#: src/service/fs/meta_data.c:1073
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr "numéro de hash"
+#: src/service/fs/meta_data.c:1092
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Résolution de « %s » échouée\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr "taille ibz"
+#: src/service/fs/meta_data.c:1124
+#, c-format
+msgid "Serialized %ld bytes of metadata"
+msgstr ""
 
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-msgid "number of values"
-msgstr "nombre de valeurs"
+#: src/service/fs/meta_data.c:1131
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
+#: src/service/gns/gns_tld_api.c:292
+msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
+#: src/service/gns/gnunet-bcd.c:573
+#, fuzzy, c-format
+msgid "Invalid port number %u\n"
+msgstr "Argument invalide « %s »\n"
 
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
+msgid "Unable to set up the daemon\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
+msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
+#: src/service/gns/gnunet-bcd.c:660
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-msgid "write statistics to file"
+#: src/service/gns/gnunet-bcd.c:669
+msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/seti/gnunet-seti-profiler.c:457
-msgid "return intersection instead of delta"
+#: src/service/gns/gnunet-dns2gns.c:296
+msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/sq/sq.c:47
+#: src/service/gns/gnunet-dns2gns.c:377
+#, fuzzy
+msgid "Failed to parse DNS response!\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/service/gns/gnunet-dns2gns.c:451
 #, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
+msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
+#: src/service/gns/gnunet-dns2gns.c:654
+#, c-format
+msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/sq/sq.c:126
+#: src/service/gns/gnunet-dns2gns.c:670
 #, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
+msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/gns/gnunet-dns2gns.c:678
 #, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:979
-#, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+#: src/service/gns/gnunet-dns2gns.c:839
+msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-msgid "Failed to obtain statistics.\n"
+#: src/service/gns/gnunet-dns2gns.c:999
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
+#: src/service/gns/gnunet-dns2gns.c:1016
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
+#: src/service/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
+#: src/service/gns/gnunet-gns-benchmark.c:588
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:577
-#, c-format
-msgid "No subsystem or name given\n"
+#: src/service/gns/gnunet-gns-benchmark.c:593
+msgid "look for GNS2DNS records instead of ANY"
+msgstr ""
+
+#: src/service/gns/gnunet-gns-import.c:490
+msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:589
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
-msgid "Failed to initialize watch routine\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:725
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Argument invalide « %s »\n"
+msgid "Unsupported CURL TLS backend %d\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:742
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, c-format
-msgid "A port is required to connect to host `%s'\n"
+msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:751
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:783
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
+#: src/service/gns/gnunet-gns-proxy.c:1056
+#, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
+#: src/service/gns/gnunet-gns-proxy.c:1067
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
+#: src/service/gns/gnunet-gns-proxy.c:1092
+#, c-format
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
+#: src/service/gns/gnunet-gns-proxy.c:1223
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
+#: src/service/gns/gnunet-gns-proxy.c:2135
+#, c-format
+msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
+#: src/service/gns/gnunet-gns-proxy.c:2654
+#, c-format
+msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
+#: src/service/gns/gnunet-gns-proxy.c:2686
+#, c-format
+msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
+#: src/service/gns/gnunet-gns-proxy.c:2895
+#, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
+msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
+#: src/service/gns/gnunet-gns-proxy.c:3268
+#, c-format
+msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:749
-msgid "Could not save some persistent statistics\n"
+#: src/service/gns/gnunet-gns-proxy.c:3300
+#, c-format
+msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
+msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:386
-msgid "create unique configuration files"
+#: src/service/gns/gnunet-gns-proxy.c:3868
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
+#: src/service/gns/gnunet-gns-proxy.c:3873
+msgid "pem file to use as CA"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+#: src/service/gns/gnunet-gns-proxy.c:3877
+msgid "disable use of IPv6"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:407
-msgid "configuration template"
+#: src/service/gns/gnunet-gns-proxy.c:3903
+msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
+#: src/service/gns/gnunet-service-gns.c:518
+msgid "Properly base32-encoded public key required"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
-msgid "Command line tool to access the testing library"
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
+msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
+msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/testing/list-keys.c:92
-msgid "list COUNT number of keys"
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
+msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
+msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/testing/testing.c:743
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, c-format
-msgid "Key number %u does not exist\n"
+msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/testing/testing.c:1217
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
+msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/testing/testing.c:1226
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
+msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+#: src/service/gns/gnunet-service-gns_resolver.c:900
+msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
+#, c-format
+msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/testing/testing.c:1265
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
+msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/testing/testing.c:1279
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/testing/testing.c:1307
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
+msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
+msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/testing/testing.c:2795
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, c-format
-msgid "Topology file %s not found\n"
+msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:2803
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
-msgid "Topology file %s has no data\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/testing/testing.c:2811
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
-msgid "Topology file %s cannot be read\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:257
-msgid "# connect requests issued to ATS"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:451
-msgid "# HELLO messages gossipped"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:805
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:870
-msgid "# HELLO messages received"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
-msgid "GNUnet topology control"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1787
-msgid "GNUnet QUIC communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
-msgid "GNUnet TCP communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
-msgid "GNUnet UDP communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
+#, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
-msgid ""
-"Maximum number of UNIX connections exceeded, dropping incoming message\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1015
-msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
-msgid "Cannot create path to `%s'\n"
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1138
-msgid "GNUnet UNIX domain socket communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
-msgid "Received %llu bytes/s (%llu bytes in %s)\n"
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
-msgid "Failed to connect to `%s'\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, c-format
-msgid "Failed to resolve address for peer `%s'\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:477
-msgid "Failed to list connections, timeout occurred\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
-msgid "Transmitting %u bytes\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:537
-#, c-format
-msgid ""
-"Successfully connected to `%s', starting to send benchmark data in %u Kb "
-"blocks\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
-#, c-format
-msgid "Disconnected from peer `%s' while benchmarking\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:592
-msgid "Connected to"
-msgstr "Connecté à"
-
-#: src/transport/gnunet-transport.c:621
-msgid "Disconnected from"
-msgstr "Déconnecté de"
-
-#: src/transport/gnunet-transport.c:654
-#, fuzzy, c-format
-msgid "Received %u bytes\n"
-msgstr "%s message(s) reçu(s)\n"
-
-#: src/transport/gnunet-transport.c:689
-#, c-format
-msgid "Peer `%s': %s %s in state `%s' until %s\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
+msgid "# active connections"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, c-format
-msgid "Peer `%s': %s %s\n"
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1103
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
+#, c-format
+msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
-msgid ""
-"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s %s\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
-msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1242
-msgid "Failed to connect to transport service for disconnection\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1248
-msgid "Blacklisting request in place, stop with CTRL-C\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
+#, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
-msgid "Failed to connect to transport service\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1301
-msgid "Starting to receive benchmark data\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
+#, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1367
-msgid "print information for all peers (instead of only connected peers)"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1373
-msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
-#, fuzzy
-msgid "disconnect from a peer"
-msgstr "Déconnecté de"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
+msgid "Learning is enabled on this peer\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:1383
-msgid "provide information about all current connections (once)"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
+#, c-format
 msgid ""
-"provide information about all connects and disconnect events (continuously)"
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1399
-msgid "do not resolve hostnames"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
+msgid "bytes in hostlist"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1404
-msgid "peer identity"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1408
-msgid "monitor plugin sessions"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-msgid "Direct access to transport service."
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/transport/transport_api2_communication.c:761
-msgid "Dropped backchanel message: handler not provided by communicator\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Erreur de lecture : « %s » : %s"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
+msgid "hostlist requests refused (not ready)"
+msgstr ""
 
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr "Fin de fichier"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
+msgid "Received request for our hostlist\n"
+msgstr ""
 
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Erreur de lecture : « %s » : %s"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
+msgid "hostlist requests processed"
+msgstr ""
 
-#: src/util/bio.c:272
-msgid "Not enough data left"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/util/bio.c:312
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, c-format
-msgid "Invalid handle type while reading `%s'"
+msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr ""
 
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
+msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr ""
 
-#: src/util/bio.c:345
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, c-format
-msgid "%s (while reading `%s')"
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/util/bio.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/util/bio.c:363
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Erreur de lecture : « %s » : %s"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr ""
 
-#: src/util/bio.c:689
-msgid "No associated file"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/util/bio.c:773
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, c-format
-msgid "Invalid handle type while writing `%s'"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
+#, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/util/client.c:1097
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:910
+#: src/service/identity/gnunet-service-identity.c:921
 #, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "ERREUR"
+#: src/service/identity/gnunet-service-identity.c:979
+#, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr ""
 
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "AVERTISSEMENT"
+#: src/service/identity/gnunet-service-identity.c:988
+#, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr ""
 
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
+#, c-format
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "INFO"
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
+#, c-format
+msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
+msgstr ""
 
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "DEBUG"
+#: src/service/namecache/namecache_api.c:283
+msgid "Namecache failed to cache block"
+msgstr ""
 
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr "AUCUN"
+#: src/service/namecache/namecache_api.c:371
+msgid "Error communicating with namecache service"
+msgstr ""
 
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr "INVALIDE"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
+msgid "can not search the namestore"
+msgstr ""
 
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr "adresse inconnue"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
+msgid "unable to scan namestore"
+msgstr ""
 
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr "adresse invalide"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
+#, fuzzy, c-format
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "erreur unconnue."
 
-#: src/util/common_logging.c:1416
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:1431
-#, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
 msgstr ""
 
-#: src/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "Résolution de « %s » échouée\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Erreur de création du tunnel\n"
 
-#: src/util/configuration.c:1718
-msgid "Not a valid relative time specification"
-msgstr ""
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "suprimer un enregistrement"
 
-#: src/util/configuration.c:1788
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:148
-#, c-format
-msgid "%s, %s or %s argument is required\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/util/configuration_helper.c:263
-#, c-format
-msgid "failed to load configuration defaults"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "adresse invalide"
+
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "adresse invalide"
+
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
+#, fuzzy, c-format
+msgid "Unable to parse key %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
+msgid "unable to parse key"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:554
-#, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
+msgid "No expiration specified for records.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:677
-#, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
+msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:282
-msgid "Could not load peer's private key\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
+msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/util/crypto_rsa.c:908
-#, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1208
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/util/disk.c:843
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
-msgid "Expected `%s' to be a directory!\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
+msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
-#: src/util/dnsparser.c:910
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/util/dnsstub.c:228
-#, c-format
-msgid "Could not bind to any port: %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
+msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/util/dnsstub.c:371
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
 
-#: src/util/dnsstub.c:509
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
-msgid "Sent DNS request to %s\n"
+msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/util/getopt.c:591
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
+msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
+msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
+msgid "upnpc not found\n"
+msgstr "upnpc introuvable\n"
+
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: src/service/nat-auto/nat_auto_api.c:73
+msgid "Operation Successful"
 msgstr ""
 
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: src/service/nat-auto/nat_auto_api.c:76
+msgid "IPC failure"
 msgstr ""
 
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: src/service/nat-auto/nat_auto_api.c:79
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
+#: src/service/nat-auto/nat_auto_api.c:82
+msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/util/getopt.c:971
-#, c-format
-msgid "Use %s to get a list of options.\n"
+#: src/service/nat-auto/nat_auto_api.c:85
+msgid "detected that we are offline"
 msgstr ""
 
-#: src/util/getopt.c:984
-#, c-format
-msgid "Option `%s' can't be used with other options.\n"
+#: src/service/nat-auto/nat_auto_api.c:88
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/util/getopt.c:996
-#, c-format
-msgid "Missing mandatory option `%s'.\n"
+#: src/service/nat-auto/nat_auto_api.c:91
+msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
+#: src/service/nat-auto/nat_auto_api.c:94
+msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/service/nat-auto/nat_auto_api.c:97
+msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
+#: src/service/nat-auto/nat_auto_api.c:100
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
+#: src/service/nat-auto/nat_auto_api.c:103
+msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
+#: src/service/nat-auto/nat_auto_api.c:106
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
+#: src/service/nat-auto/nat_auto_api.c:109
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/util/getopt_helpers.c:463
-msgid "use configuration file FILENAME"
+#: src/service/nat-auto/nat_auto_api.c:113
+msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
+#: src/service/nat-auto/nat_auto_api.c:116
+msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/util/getopt_helpers.c:571
-#, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+#: src/service/nat-auto/nat_auto_api.c:119
+msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
+#: src/service/nat-auto/nat_auto_api.c:122
+msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
+#: src/service/nat-auto/nat_auto_api.c:125
+msgid "could not register NAT"
 msgstr ""
 
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
+#: src/service/nat-auto/nat_auto_api.c:128
+msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/util/getopt_helpers.c:632
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, c-format
-msgid "You must pass relative time to the `%s' option.\n"
+msgid "Failed to find valid PORT in section `%s'\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:686
+#: src/service/nat-auto/nat_auto_api_test.c:489
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:743
+#: src/service/nat/gnunet-service-nat.c:1362
 #, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:750
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:806
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
+msgstr ""
+
+#: src/service/nat/gnunet-service-nat.c:1861
+msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:876
+#: src/service/nat/gnunet-service-nat.c:1935
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP\n"
+msgstr ""
+
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:954
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgid "Failed to start %s\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/service/nat/gnunet-service-nat_mini.c:188
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
+#: src/service/nat/gnunet-service-nat_mini.c:602
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
+#: src/service/nse/gnunet-nse-profiler.c:857
+msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
+#: src/service/nse/gnunet-nse-profiler.c:864
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
+#: src/service/nse/gnunet-nse-profiler.c:879
+msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
+#: src/service/nse/gnunet-nse-profiler.c:888
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
+#: src/service/nse/gnunet-nse-profiler.c:900
+msgid "delay between rounds"
 msgstr ""
 
-#: src/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
+#: src/service/nse/gnunet-nse-profiler.c:912
+msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
+#: src/service/peerstore/gnunet-peerstore.c:92
+msgid "peerstore"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:95
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, c-format
-msgid "Failed to open `%s': %s\n"
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:129
+#: src/service/peerstore/gnunet-service-peerstore.c:661
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
+
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
-msgid "Generating %u keys like %s, please wait"
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
+#: src/service/peerstore/gnunet-service-peerstore.c:692
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:178
-#, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
+msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:185
-#, c-format
-msgid ""
-"\n"
-"Finished!\n"
+#: src/service/peerstore/peerstore_api.c:781
+msgid "Received a malformed response from service."
 msgstr ""
-"\n"
-"Terminé !\n"
 
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
+#: src/service/peerstore/peerstore_api.c:895
+msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:304
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, c-format
-msgid "Hostkeys file `%s' not found\n"
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:314
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, c-format
-msgid "Hostkeys file `%s' is empty\n"
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:334
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, c-format
-msgid "Could not read hostkey file: %s\n"
+msgid "Unable to create indices: %s.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
+#: src/service/pt/gnunet-daemon-pt.c:416
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
+#: src/service/pt/gnunet-daemon-pt.c:422
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
+#: src/service/pt/gnunet-daemon-pt.c:476
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
+#: src/service/pt/gnunet-daemon-pt.c:671
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
+#: src/service/pt/gnunet-daemon-pt.c:678
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
+#: src/service/pt/gnunet-daemon-pt.c:716
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
-msgid "print the public key in HEX format"
+#: src/service/pt/gnunet-daemon-pt.c:771
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
+#: src/service/pt/gnunet-daemon-pt.c:777
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:499
-msgid "Manipulate GNUnet private ECC key files"
+#: src/service/pt/gnunet-daemon-pt.c:786
+msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "URI invalide « %s »\n"
+#: src/service/pt/gnunet-daemon-pt.c:881
+msgid "# DNS replies received"
+msgstr ""
 
-#: src/util/gnunet-qr.c:161
-#, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
+#: src/service/pt/gnunet-daemon-pt.c:898
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:171
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
+msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:182
-#, c-format
-msgid "No known handler for subsystem `%s'\n"
+#: src/service/pt/gnunet-daemon-pt.c:1314
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/util/gnunet-qr.c:218
+#: src/service/reclaim/reclaim_api.c:544
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, c-format
-msgid "Unable to start child process `%s'\n"
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "Résolution de « %s » échouée : %s\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "En cous de démarrage %s…\n"
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
+msgid "Daemon to announce regular expressions for the peer using cadet."
+msgstr ""
 
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
+#: src/service/regex/gnunet-regex-profiler.c:1365
+msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
-msgid "Got %d images\n"
+msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
-msgid "Found %s: \"%s\"\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, c-format
-msgid "%s is not a PNG file\n"
+msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:546
-#, fuzzy
-msgid "No data found\n"
-msgstr "upnpc introuvable\n"
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
+#: src/service/regex/gnunet-regex-profiler.c:1430
+msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
+#: src/service/regex/gnunet-regex-profiler.c:1450
+msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
+#: src/service/regex/gnunet-regex-profiler.c:1539
+msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
+#: src/service/regex/gnunet-regex-profiler.c:1546
+msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
+#: src/service/regex/gnunet-regex-profiler.c:1552
+msgid "directory with policy files"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:183
-msgid "Use built-in GNUnet stub resolver"
+#: src/service/regex/gnunet-regex-profiler.c:1559
+msgid "name of file with input strings"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/service/regex/gnunet-regex-profiler.c:1566
+msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
+#: src/service/regex/gnunet-regex-profiler.c:1581
+msgid "Profiler for regex"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
+msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
+msgid "maximum path compression length"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
+msgid "Profiler for regex library"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
-msgid "Manipulate GNUnet proof of work files"
+#: src/service/regex/regex_api_announce.c:151
+#, c-format
+msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1288
-msgid "No DNS server available. DNS resolution will not be possible.\n"
+#: src/service/regex/regex_api_search.c:200
+#, c-format
+msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
+#: src/service/rest/gnunet-rest-server.c:1369
+msgid "GNUnet REST server"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+#: src/service/revocation/gnunet-service-revocation.c:539
+msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+#: src/service/revocation/gnunet-service-revocation.c:549
+msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/util/gnunet-uri.c:109
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
+#: src/service/revocation/gnunet-service-revocation.c:558
+msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/util/helper.c:304
-#, c-format
-msgid "Error reading from `%s': %s\n"
+#: src/service/revocation/gnunet-service-revocation.c:566
+msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/util/helper.c:356
-#, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
+#: src/service/revocation/gnunet-service-revocation.c:604
+msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/util/helper.c:571
-#, c-format
-msgid "Error writing to `%s': %s\n"
+#: src/service/revocation/gnunet-service-revocation.c:959
+msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+#: src/service/seti/gnunet-seti-profiler.c:457
+msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/util/network.c:1284
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/util/os_installation.c:416
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/util/os_installation.c:787
-#, c-format
-msgid "Could not find binary `%s' in PATH!\n"
+#: src/service/statistics/statistics_api.c:749
+msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/util/os_installation.c:820
+#: src/service/testing/gnunet-testing.c:185
 #, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/util/plugin.c:158
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+#: src/service/testing/gnunet-testing.c:386
+msgid "create unique configuration files"
 msgstr ""
 
-#: src/util/plugin.c:215
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+#: src/service/testing/gnunet-testing.c:392
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/util/plugin.c:371
-msgid "Could not determine plugin installation path.\n"
+#: src/service/testing/gnunet-testing.c:400
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr ""
 
-#: src/util/program.c:287
-#, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
+#: src/service/testing/gnunet-testing.c:407
+msgid "configuration template"
 msgstr ""
 
-#: src/util/program.c:299
-#, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
+#: src/service/testing/gnunet-testing.c:415
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/util/program.c:314
-#, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
+#: src/service/testing/gnunet-testing.c:432
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/util/program.c:329
-msgid "Malformed configuration. Exiting ...\n"
+#: src/service/testing/list-keys.c:92
+msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/util/regex.c:123
+#: src/service/testing/testing.c:291
 #, c-format
-msgid "Bad mask: %d\n"
-msgstr "Masque érroné : %d\n"
+msgid "Hostkeys file not found: %s\n"
+msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/service/testing/testing.c:743
 #, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/util/resolver_api.c:243
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:888
+#: src/service/testing/testing.c:1226
 #, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+#: src/service/testing/testing.c:1236
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1086
-msgid "Resolver not configured correctly.\n"
+#: src/service/testing/testing.c:1249
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr "Résolution de « %s » échouée : %s\n"
-
-#: src/util/service.c:654
+#: src/service/testing/testing.c:1265
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:838
+#: src/service/testing/testing.c:1279
 #, c-format
-msgid "Unknown address family %d\n"
+msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/util/service.c:951
+#: src/service/testing/testing.c:1307
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/util/service.c:992
+#: src/service/testing/testing.c:1413
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/service/testing/testing.c:1664
 #, c-format
-msgid "`%s' failed for port %d (%s).\n"
+msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/util/service.c:1413
+#: src/service/testing/testing.c:2795
 #, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/util/service.c:1420
+#: src/service/testing/testing.c:2803
 #, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/util/service.c:1481
+#: src/service/testing/testing.c:2811
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/service/topology/gnunet-daemon-topology.c:257
+msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+#: src/service/topology/gnunet-daemon-topology.c:451
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr "Aucun utilisateur trouvé"
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+#: src/service/topology/gnunet-daemon-topology.c:805
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
+#: src/service/topology/gnunet-daemon-topology.c:870
+msgid "# HELLO messages received"
 msgstr ""
 
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
+#: src/service/topology/gnunet-daemon-topology.c:1005
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
+#: src/service/transport/gnunet-communicator-quic.c:1787
+msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/util/service.c:2099
-msgid "Malformed configuration, exit ...\n"
+#: src/service/transport/gnunet-communicator-tcp.c:4071
+msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+#: src/service/transport/gnunet-communicator-udp.c:3433
+msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+#: src/service/transport/gnunet-communicator-unix.c:788
+msgid ""
+"Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/service/transport/gnunet-communicator-unix.c:1015
+msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/service/transport/gnunet-communicator-unix.c:1060
+#, c-format
+msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
+#: src/service/transport/gnunet-communicator-unix.c:1138
+msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
+#: src/service/transport/gnunet-transport.c:406
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+#: src/service/transport/gnunet-transport.c:415
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
+#: src/service/transport/gnunet-transport.c:454
+#, c-format
+msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1081
+#: src/service/transport/gnunet-transport.c:466
 #, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
+msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
+#: src/service/transport/gnunet-transport.c:477
+msgid "Failed to list connections, timeout occurred\n"
 msgstr ""
 
-#: src/util/strings.c:1283
+#: src/service/transport/gnunet-transport.c:504
 #, c-format
-msgid "Malformed port policy `%s'\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
-msgid "Invalid format for IP: `%s'\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/util/strings.c:1408
+#: src/service/transport/gnunet-transport.c:566
 #, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/util/strings.c:1459
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "fornat invalide : « %s »\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:592
+msgid "Connected to"
+msgstr "Connecté à"
+
+#: src/service/transport/gnunet-transport.c:621
+msgid "Disconnected from"
+msgstr "Déconnecté de"
+
+#: src/service/transport/gnunet-transport.c:654
+#, fuzzy, c-format
+msgid "Received %u bytes\n"
+msgstr "%s message(s) reçu(s)\n"
 
-#: src/util/strings.c:1501
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/util/strings.c:1551
+#: src/service/transport/gnunet-transport.c:701
 #, c-format
-msgid "Wrong format `%s' for netmask\n"
+msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/util/strings.c:1582
-#, c-format
-msgid "Wrong format `%s' for network\n"
+#: src/service/transport/gnunet-transport.c:1103
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/util/time.c:901 src/util/time.c:929
+#: src/service/transport/gnunet-transport.c:1199
 #, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s %s\n"
 msgstr ""
 
-#: src/util/time.c:937
+#: src/service/transport/gnunet-transport.c:1214
 #, c-format
 msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
-msgid "# Active channels"
-msgstr "# Canaux actifs"
-
-#: src/vpn/gnunet-service-vpn.c:582
-msgid "# Messages dropped in cadet queue (overflow)"
+#: src/service/transport/gnunet-transport.c:1242
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:735
-msgid "# ICMP packets received from cadet"
+#: src/service/transport/gnunet-transport.c:1248
+msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1111
-msgid "# UDP packets received from cadet"
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
+msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1261
-msgid "# TCP packets received from cadet"
+#: src/service/transport/gnunet-transport.c:1301
+msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1460
-msgid "# Cadet channels created"
+#: src/service/transport/gnunet-transport.c:1367
+msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1684
-#, c-format
-msgid "Protocol %u not supported, dropping\n"
+#: src/service/transport/gnunet-transport.c:1373
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1820
-msgid "# Packets dropped (channel not yet online)"
+#: src/service/transport/gnunet-transport.c:1377
+#, fuzzy
+msgid "disconnect from a peer"
+msgstr "Déconnecté de"
+
+#: src/service/transport/gnunet-transport.c:1383
+msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2018
-msgid "# ICMPv4 packets dropped (not allowed)"
+#: src/service/transport/gnunet-transport.c:1395
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2044
-msgid "# ICMPv6 packets dropped (not allowed)"
+#: src/service/transport/gnunet-transport.c:1399
+msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2281
-msgid "# Packets received from TUN interface"
+#: src/service/transport/gnunet-transport.c:1404
+msgid "peer identity"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
-#, c-format
-msgid "Packet received for unmapped destination `%s' (dropping it)\n"
+#: src/service/transport/gnunet-transport.c:1408
+msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2354
-msgid "Received IPv4 packet with options (dropping it)\n"
+#: src/service/transport/gnunet-transport.c:1414
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2370
-#, c-format
-msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
+#: src/service/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2410
-msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+#: src/service/transport/transport_api2_communication.c:761
+msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2462
-msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+#: src/service/util/gnunet-service-resolver.c:1288
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
-msgid "# Active destinations"
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
+msgid "# Active channels"
+msgstr "# Canaux actifs"
+
+#: src/service/vpn/gnunet-service-vpn.c:582
+msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2749
-msgid "Failed to allocate IP address for new destination\n"
+#: src/service/vpn/gnunet-service-vpn.c:735
+msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3007
-msgid "Must specify valid IPv6 address"
+#: src/service/vpn/gnunet-service-vpn.c:1111
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3035
-msgid "Must specify valid IPv6 mask"
+#: src/service/vpn/gnunet-service-vpn.c:1261
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
-msgid "IPv6 support disabled as this system does not support IPv6\n"
+#: src/service/vpn/gnunet-service-vpn.c:1460
+msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3061
-msgid "Must specify valid IPv4 address"
+#: src/service/vpn/gnunet-service-vpn.c:1684
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3078
-msgid "Must specify valid IPv4 mask"
+#: src/service/vpn/gnunet-service-vpn.c:1820
+msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
-msgid "IPv4 support disabled as this system does not support IPv4\n"
+#: src/service/vpn/gnunet-service-vpn.c:2018
+msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:142
-msgid "Error creating tunnel\n"
-msgstr "Erreur de création du tunnel\n"
+#: src/service/vpn/gnunet-service-vpn.c:2044
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
 
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
+#: src/service/vpn/gnunet-service-vpn.c:2281
+msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:202
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
-msgid "Option `%s' or `%s' is required.\n"
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:216
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+#: src/service/vpn/gnunet-service-vpn.c:2354
+msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:239
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
-msgid "`%s' is not a valid peer identifier.\n"
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:258
-#, c-format
-msgid "`%s' is not a valid IP address.\n"
+#: src/service/vpn/gnunet-service-vpn.c:2410
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
+#: src/service/vpn/gnunet-service-vpn.c:2462
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
+msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
+#: src/service/vpn/gnunet-service-vpn.c:2749
+msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
+#: src/service/vpn/gnunet-service-vpn.c:3007
+msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
+#: src/service/vpn/gnunet-service-vpn.c:3035
+msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
+#: src/service/vpn/gnunet-service-vpn.c:3045
+msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:334
-msgid "service is offered via TCP"
+#: src/service/vpn/gnunet-service-vpn.c:3061
+msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:339
-msgid "service is offered via UDP"
+#: src/service/vpn/gnunet-service-vpn.c:3078
+msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr "Configurer des tunnels via VPN."
+#: src/service/vpn/gnunet-service-vpn.c:3090
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 7427dd679..a2787f547 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,7358 +20,7440 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, c-format
-msgid "Failed to connect to namestore\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:566
-msgid "Ego does not exist!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, c-format
-msgid "ego required\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-msgid "The public key of the authority to verify the credential against"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1030
-msgid "The ego/zone name to use"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-msgid "GNUnet abd resolver tool"
-msgstr ""
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr ""
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr "Messaggio inviato con successo"
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 msgid "service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Servizi in esecuzione:\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "Avvio del servizio '%s' in corso\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s arrestato.\n"
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, c-format
 msgid "Starting %s...\n"
 msgstr "Avvio di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Arresto di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr "arresta tutti i servizi GNUnet"
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr "elenca i servizi in esecuzione"
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
 #, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/cadet/gnunet-cadet.c:685
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/cadet/gnunet-cadet.c:746
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
-#, c-format
-msgid "Using `%s' instead\n"
+#: src/cli/cadet/gnunet-cadet.c:775
+msgid "No action requested\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+#: src/cli/cadet/gnunet-cadet.c:800
+msgid "Provide information about a particular connection"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+#: src/cli/cadet/gnunet-cadet.c:817
+msgid "Provide information about a patricular peer"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:951
-#, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/cli/cadet/gnunet-cadet.c:822
+msgid "Provide information about all peers"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:962
-#, c-format
-msgid "Starting service `%s'\n"
-msgstr "Avvio del servizio '%s' in corso\n"
+#: src/cli/cadet/gnunet-cadet.c:827
+msgid "Provide information about all tunnels"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1062
-#, c-format
-msgid "Unable to create socket for service `%s': %s\n"
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr "# amici connessi"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1093
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/cli/core/gnunet-core.c:99
+#, fuzzy
+msgid "key received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/cli/core/gnunet-core.c:103
+msgid "connection established"
+msgstr "connessione stabilita"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1124
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "Disconnesso da"
+
+#: src/cli/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/core/gnunet-core.c:124
+msgid "unknown state"
+msgstr "stato sconosciuto"
+
+#: src/cli/core/gnunet-core.c:129
 #, c-format
-msgid "Preparing to stop `%s'\n"
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/core/gnunet-core.c:157
 #, c-format
-msgid "Restarting service `%s'.\n"
+msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
-msgstr "uscita"
+#: src/cli/core/gnunet-core.c:163
+msgid "Failed to connect to CORE service!\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1765
-msgid "unknown"
-msgstr "sconosciuto"
+#: src/cli/core/gnunet-core.c:196
+msgid "Print information about connected peers."
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/datastore/gnunet-datastore.c:187
 #, c-format
-msgid "Service `%s' took %s to terminate\n"
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/datastore/gnunet-datastore.c:257
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "Error queueing datastore GET operation\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/datastore/gnunet-datastore.c:319
+#, c-format
+msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
+#: src/cli/datastore/gnunet-datastore.c:378
+#, c-format
+msgid "Error queueing datastore PUT operation\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:187
-msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
-msgid "public auction outcome"
-msgstr ""
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/datastore/gnunet-datastore.c:454
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/datastore/gnunet-datastore.c:477
+msgid "Dump all records from the datastore"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
-msgid "help text"
+#: src/cli/datastore/gnunet-datastore.c:482
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# byte inviati via SMTP"
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:606
-#, c-format
-msgid "Invalid peer ID `%s'\n"
+#: src/cli/datastore/gnunet-datastore.c:498
+msgid "Manipulate GNUnet datastore"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/dht/gnunet-dht-get.c:167
 #, c-format
-msgid "Invalid target `%s'\n"
+msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:775
-msgid "No action requested\n"
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:800
-msgid "Provide information about a particular connection"
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
+#, c-format
+msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/dht/gnunet-dht-get.c:256
+msgid "Issuing DHT GET with key"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
-msgid "Provide information about a patricular peer"
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:822
-msgid "Provide information about all peers"
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+msgid "use DHT's record route option"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:827
-msgid "Provide information about all tunnels"
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
-msgid "Connection to conversation service lost, trying to reconnect\n"
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
-#, c-format
-msgid ""
-"\n"
-"ew are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
-#, c-format
-msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
-#, c-format
-msgid "Call from `%s' terminated\n"
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
-#, c-format
-msgid "Call from `%s' suspended by other user\n"
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
-#, c-format
-msgid "Call from `%s' resumed by other user\n"
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/cli/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
 #, c-format
-msgid "Ego `%s' no longer available, phone is now down.\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
-msgid "Failed to setup phone (internal error)\n"
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:368
-#, c-format
-msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
-#, c-format
-msgid "Resolved address of `%s'. Now ringing other party.\n"
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
-#, c-format
-msgid "Connection established to `%s'\n"
-msgstr "Connessione stabilita con `%s'\n"
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:404
-#, c-format
-msgid "Failed to resolve `%s'\n"
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/cli/fs/gnunet-auto-share.c:234
 #, c-format
-msgid "Call to `%s' terminated\n"
+msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
 #, c-format
-msgid "Connection to `%s' suspended (by other user)\n"
+msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/cli/fs/gnunet-auto-share.c:401
 #, c-format
-msgid "Connection to `%s' resumed (by other user)\n"
+msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/cli/fs/gnunet-auto-share.c:480
 #, c-format
-msgid "Error with the call, restarting it\n"
+msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/cli/fs/gnunet-auto-share.c:491
 #, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Comando `%s' sconosciuto.\n"
+msgid "Failed to run `%s'\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/cli/fs/gnunet-auto-share.c:661
 #, c-format
-msgid "Ego `%s' not available\n"
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
-#, c-format
-msgid "You are calling someone else already, hang up first!\n"
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
-#, c-format
-msgid "You are answering call from `%s', hang up or suspend that call first!\n"
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
-#, c-format
-msgid "Call recipient missing.\n"
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:607
-#, c-format
-msgid "There is no incoming call to accept here!\n"
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:622
-#, c-format
-msgid "There is no incoming call `%s' to accept right now!\n"
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
-msgid "We currently do not have an address.\n"
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/cli/fs/gnunet-directory.c:54
 #, c-format
-msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/cli/fs/gnunet-directory.c:106
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
+msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/cli/fs/gnunet-directory.c:109
 #, c-format
-msgid "You are having a conversation with `%s'.\n"
+msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
-#, c-format
-msgid ""
-"We had an internal error setting up our phone line. You can still make "
-"calls.\n"
+#: src/cli/fs/gnunet-directory.c:146
+msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/cli/fs/gnunet-directory.c:160
 #, c-format
-msgid "We are trying to find the network address to call `%s'.\n"
+msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/cli/fs/gnunet-directory.c:170
 #, c-format
-msgid "We are calling `%s', their phone should be ringing.\n"
+msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:728
-msgid "Calls waiting:\n"
+#: src/cli/fs/gnunet-directory.c:201
+msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/cli/fs/gnunet-download.c:131
 #, c-format
-msgid "#%u: `%s'\n"
+msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
-msgid "There is no call that could be suspended right now.\n"
+#: src/cli/fs/gnunet-download.c:143
+msgid "<unknown time>"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
-msgid "There is no call that could be resumed right now.\n"
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/cli/fs/gnunet-download.c:177
 #, c-format
-msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/cli/fs/gnunet-download.c:189
 #, c-format
-msgid "There is no incoming call to resume here!\n"
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
 #, c-format
-msgid "There is no incoming call `%s' to resume right now!\n"
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
-msgid "There is no call that could be cancelled right now.\n"
+#: src/cli/fs/gnunet-download.c:234
+msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
 #, c-format
-msgid "There is no incoming call to refuse here!\n"
+msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
-#, c-format
-msgid "There is no incoming call `%s' to refuse right now!\n"
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
-msgid "Use `/address' to find out which address this phone should have in GNS"
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
-msgid "Use `/call USER.gnu' to call USER"
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
+#, c-format
+msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
-msgid "Use `/accept #NUM' to accept incoming call #NUM"
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
-msgid "Use `/suspend' to suspend the active call"
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
-msgid ""
-"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
-"calls, no argument is needed to resume the current outgoing call."
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
-msgid "Use `/cancel' to reject or terminate a call"
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
-msgid "Use `/status' to print status information"
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
-msgid "Use `/quit' to terminate gnunet-conversation"
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
-msgid "Use `/help command' to get help for a specific command"
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1124
-#, c-format
-msgid "Name of our ego changed to `%s'\n"
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1134
-#, c-format
-msgid "Our ego `%s' was deleted!\n"
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1166
-msgid "You must specify the NAME of an ego to use\n"
+#: src/cli/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1193
-msgid "sets the NAME of the ego to use for the caller ID"
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
+#, c-format
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
-msgid "sets the LINE to use for the phone"
+#: src/cli/fs/gnunet-publish.c:247
+#, c-format
+msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
-msgid "Enables having a conversation with other GNUnet users."
+#: src/cli/fs/gnunet-publish.c:255
+#, c-format
+msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/cli/fs/gnunet-publish.c:259
 #, c-format
-msgid "Read error from STDIN: %d %s\n"
+msgid "URI is `%s'.\n"
 msgstr ""
+"L'URI è `%s'.\n"
+"\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
-#, c-format
-msgid "pa_stream_write() failed: %s\n"
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
 msgstr ""
+"L'URI è `%s'.\n"
+"\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
-msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+#: src/cli/fs/gnunet-publish.c:280
+msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
-msgid "Connection established.\n"
+#: src/cli/fs/gnunet-publish.c:287
+msgid "Cleanup after abort completed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
-#, c-format
-msgid "pa_stream_new() failed: %s\n"
+#: src/cli/fs/gnunet-publish.c:292
+msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/cli/fs/gnunet-publish.c:426
 #, c-format
-msgid "pa_stream_connect_playback() failed: %s\n"
+msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/cli/fs/gnunet-publish.c:428
 #, c-format
-msgid "Connection failure: %s\n"
+msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
-msgid "Wrong Spec\n"
-msgstr "Specifiche errate\n"
-
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
-msgid "pa_mainloop_new() failed.\n"
+#: src/cli/fs/gnunet-publish.c:583
+msgid "Could not publish\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
-msgid "pa_context_new() failed.\n"
+#: src/cli/fs/gnunet-publish.c:612
+msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/cli/fs/gnunet-publish.c:645
 #, c-format
-msgid "pa_context_connect() failed: %s\n"
+msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
-msgid "pa_mainloop_run() failed.\n"
+#: src/cli/fs/gnunet-publish.c:647
+#, c-format
+msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/cli/fs/gnunet-publish.c:653
 #, c-format
-msgid "Read error from STDIN: %s\n"
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:356
-#, c-format
-msgid "opus_encode_float() failed: %s. Aborting\n"
+#: src/cli/fs/gnunet-publish.c:659
+msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/cli/fs/gnunet-publish.c:665
 #, c-format
-msgid "pa_stream_peek() failed: %s\n"
+msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:477
-msgid "Got signal, exiting.\n"
-msgstr "Segnale ricevuto. Uscita in corso.\n"
-
-#: src/conversation/gnunet-helper-audio-record.c:504
-msgid "Stream successfully created.\n"
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:509
-#, c-format
-msgid "pa_stream_get_buffer_attr() failed: %s\n"
-msgstr ""
+#: src/cli/fs/gnunet-publish.c:679
+#, fuzzy
+msgid "Error scanning directory.\n"
+msgstr "Errore interno."
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/cli/fs/gnunet-publish.c:706
 #, c-format
-msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/cli/fs/gnunet-publish.c:738
 #, c-format
-msgid "Using sample spec '%s', channel map '%s'.\n"
+msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
-#, c-format
-msgid "Connected to device %s (%u, %ssuspended).\n"
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/cli/fs/gnunet-publish.c:811
 #, c-format
-msgid "Stream error: %s\n"
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/cli/fs/gnunet-publish.c:818
 #, c-format
-msgid "pa_stream_connect_record() failed: %s\n"
-msgstr ""
-
-#: src/conversation/gnunet-helper-audio-record.c:703
-msgid "ogg_stream_init() failed.\n"
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:748
-#, fuzzy, c-format
-msgid "Failed to allocate %u bytes for second packet\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/cli/fs/gnunet-publish.c:824
 #, c-format
-msgid "Could not open line, port %s already in use!\n"
-msgstr ""
-
-#: src/conversation/microphone.c:118
-msgid "Could not start record audio helper\n"
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
 #, c-format
-msgid "PHONE version %u not supported\n"
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
 #, c-format
-msgid "Unable to parse PHONE record `%s'\n"
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/conversation/speaker.c:73
-msgid "Could not start playback audio helper.\n"
+#: src/cli/fs/gnunet-publish.c:907
+msgid "enable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/core/gnunet-core.c:91
-#, fuzzy
-msgid "fresh connection"
-msgstr "# amici connessi"
-
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
-#, fuzzy
-msgid "key received"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/core/gnunet-core.c:103
-msgid "connection established"
-msgstr "connessione stabilita"
-
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/core/gnunet-core.c:111
-#, fuzzy
-msgid "disconnected"
-msgstr "Disconnesso da"
-
-#: src/core/gnunet-core.c:120
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/cli/fs/gnunet-publish.c:928
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/core/gnunet-core.c:124
-msgid "unknown state"
-msgstr "stato sconosciuto"
-
-#: src/core/gnunet-core.c:129
-#, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
-#, c-format
-msgid "Invalid command line argument `%s'\n"
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/core/gnunet-core.c:163
-msgid "Failed to connect to CORE service!\n"
+#: src/cli/fs/gnunet-publish.c:953
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
-msgid "provide information about all current connections (continuously)"
+#: src/cli/fs/gnunet-publish.c:965
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/core/gnunet-core.c:196
-msgid "Print information about connected peers."
+#: src/cli/fs/gnunet-publish.c:972
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:329
-msgid "# send requests dropped (disconnected)"
+#: src/cli/fs/gnunet-publish.c:980
+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/core/gnunet-service-core.c:355
-msgid "# dequeuing CAR (duplicate request)"
+#: src/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/cli/fs/gnunet-search.c:446
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:505
-msgid "# messages discarded (session disconnected)"
+#: src/cli/fs/gnunet-search.c:535
+#, c-format
+msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:824
+#: src/cli/fs/gnunet-search.c:595
 #, c-format
-msgid "# messages of type %u discarded (client busy)"
+msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:926
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:954
-#, fuzzy, c-format
-msgid "Core service of `%s' ready.\n"
-msgstr "Avvio del servizio '%s' in corso\n"
-
-#: src/core/gnunet-service-core_kx.c:511
-msgid "# bytes encrypted"
-msgstr "# byte crittografati"
-
-#: src/core/gnunet-service-core_kx.c:569
-msgid "# bytes decrypted"
-msgstr "# byte decrittati"
-
-#: src/core/gnunet-service-core_kx.c:666
-msgid "# PAYLOAD dropped (out of order)"
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:718
-msgid "# key exchanges initiated"
+#: src/cli/fs/gnunet-search.c:629
+msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:774
-msgid "# key exchanges stopped"
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:806
-msgid "# PING messages transmitted"
-msgstr "# Messaggi PING trasmessi"
+#: src/cli/fs/gnunet-search.c:662
+#, c-format
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:865
-msgid "# old ephemeral keys ignored"
+#: src/cli/fs/gnunet-search.c:676
+msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
-#, fuzzy
-msgid "# duplicate ephemeral keys ignored"
-msgstr "# messaggi PONG ricevuti"
+#: src/cli/fs/gnunet-search.c:702
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
-#, fuzzy
-msgid "# EPHEMERAL_KEYs rejected (bad signature)"
-msgstr "# messaggi SYN ricevuti"
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:936
-#, c-format
+#: src/cli/fs/gnunet-search.c:715
 msgid ""
-"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
-"our system time (%llu not in [%llu,%llu]).\n"
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
-#, fuzzy
-msgid "# EPHEMERAL_KEY messages rejected due to time"
-msgstr "# messaggi SYN ricevuti"
-
-#: src/core/gnunet-service-core_kx.c:962
-#, fuzzy
-msgid "# valid ephemeral keys received"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/core/gnunet-service-core_kx.c:1072
-msgid "# PING messages received"
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1082
-msgid "# PING messages dropped (out of order)"
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1134
-msgid "# PONG messages created"
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1159
-msgid "# sessions terminated by timeout"
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1172
-msgid "# keepalive messages sent"
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1229
-msgid "# PONG messages received"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/core/gnunet-service-core_kx.c:1237
-msgid "# PONG messages dropped (connection down)"
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1246
-msgid "# PONG messages dropped (out of order)"
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1288
-msgid "# PONG messages decrypted"
-msgstr "# messaggi PONG decrittati"
-
-#: src/core/gnunet-service-core_kx.c:1331
-msgid "# session keys confirmed via PONG"
+#: src/cli/fs/gnunet-search.c:789
+msgid "Search for files that have been published on GNUnet\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1343
-msgid "# timeouts prevented via PONG"
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1352
-msgid "# rekey operations confirmed via PONG"
+#: src/cli/fs/gnunet-unindex.c:103
+#, c-format
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
-msgid "# DATA message dropped (out of order)"
+#: src/cli/fs/gnunet-unindex.c:109
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/cli/fs/gnunet-unindex.c:142
 #, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
-msgid "# sessions terminated by key expiration"
+#: src/cli/fs/gnunet-unindex.c:162
+msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
-msgid "# bytes dropped (duplicates)"
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1632
-msgid "# bytes dropped (out of sequence)"
+#: src/cli/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1679
-msgid "# bytes dropped (ancient message)"
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1689
-msgid "# bytes of payload decrypted"
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, c-format
+msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
-msgid "# peers connected"
-msgstr "# nodi connessi"
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:285
-msgid "# type map refreshes sent"
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:400
-msgid "# outdated typemap confirmations received"
+#: src/cli/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:418
-msgid "# valid typemap confirmations received"
+#: src/cli/gns/gnunet-gns.c:351
+msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
-msgid "# type maps received"
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:217
-msgid "# updates to my type map"
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:492
-msgid "Heap datacache running\n"
+#: src/cli/gns/gnunet-gns.c:374
+msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
+#: src/cli/identity/gnunet-identity.c:225
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
+msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
 msgstr ""
 
-#: src/datastore/datastore_api.c:340
-#, fuzzy
-msgid "DATASTORE disconnected"
-msgstr "Disconnesso da"
-
-#: src/datastore/datastore_api.c:462
-#, fuzzy
-msgid "Disconnected from DATASTORE"
-msgstr "Disconnesso da"
-
-#: src/datastore/datastore_api.c:565
-msgid "# queue overflows"
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
 msgstr ""
 
-#: src/datastore/datastore_api.c:595
-msgid "# queue entries created"
+#: src/cli/identity/gnunet-identity.c:551
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:756
-msgid "# status messages received"
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:810
-msgid "# Results received"
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:917
-msgid "# datastore connections (re)created"
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1007
-msgid "# PUT requests executed"
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1068
-msgid "# RESERVE requests executed"
+#: src/cli/identity/gnunet-identity.c:576
+msgid "reduce output"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1113
-msgid "# RELEASE RESERVE requests executed"
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1171
-msgid "# REMOVE requests executed"
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1230
-msgid "# GET REPLICATION requests executed"
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1276
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/cli/identity/gnunet-identity.c:597
+msgid "display private keys as well"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
-msgid "# GET requests executed"
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:187
+#: src/cli/namecache/gnunet-namecache.c:105
 #, c-format
-msgid "Dumped %<PRIu64> records\n"
+msgid "No records found for `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
 #, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
+msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:257
+#: src/cli/namecache/gnunet-namecache.c:174
 #, c-format
-msgid "Error queueing datastore GET operation\n"
+msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
+#: src/cli/namecache/gnunet-namecache.c:181
 #, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "Generazione statistiche fallita\n"
+msgid "Invalid public key for zone `%s'\n"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/datastore/gnunet-datastore.c:319
+#: src/cli/namecache/gnunet-namecache.c:187
 #, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr ""
+msgid "You must specify a name\n"
+msgstr "È necessario specificare un nome\n"
 
-#: src/datastore/gnunet-datastore.c:331
-#, c-format
-msgid "Inserted %<PRIu64> records\n"
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
+#: src/cli/namecache/gnunet-namecache.c:220
+msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:378
-#, c-format
-msgid "Error queueing datastore PUT operation\n"
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:417
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
 #, c-format
-msgid "Input file is not of a supported format\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/datastore/gnunet-datastore.c:454
-#, c-format
-msgid "Please choose at least one operation: %s, %s\n"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:477
-msgid "Dump all records from the datastore"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:482
-#, fuzzy
-msgid "Insert records into the datastore"
-msgstr "# byte inviati via SMTP"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
 
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+msgid "GNUnet namestore database manipulation tool"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:498
-msgid "Manipulate GNUnet datastore"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:335
-msgid "# bytes expired"
-msgstr "# byte scaduti"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/datastore/gnunet-service-datastore.c:419
-msgid "# bytes purged (low-priority)"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "nome file troppo lungo"
 
-#: src/datastore/gnunet-service-datastore.c:551
-msgid "# results found"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Impossibile leggere il file"
 
-#: src/datastore/gnunet-service-datastore.c:593
-#, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
-"%llu bytes\n"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:612
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:619
-msgid "Insufficient space to satisfy request"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, c-format
+msgid "Data `%s' invalid\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
-msgid "# reserved"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/datastore/gnunet-service-datastore.c:693
-msgid "Could not find matching reservation"
-msgstr ""
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/datastore/gnunet-service-datastore.c:743
-msgid "# bytes stored"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/cli/namestore/gnunet-namestore.c:411
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:858
-msgid "# GET requests received"
-msgstr "# richieste GET ricevute"
-
-#: src/datastore/gnunet-service-datastore.c:888
-#, fuzzy
-msgid "# GET KEY requests received"
-msgstr "# richieste GET ricevute"
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/datastore/gnunet-service-datastore.c:899
-msgid "# requests filtered by bloomfilter"
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:940
-msgid "# GET REPLICATION requests received"
+#: src/cli/namestore/gnunet-namestore.c:434
+#, c-format
+msgid "Error parsing expiration time %s.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:971
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Indirizzo IPv6 non valido: `%s'\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, c-format
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1012
-msgid "Content not found"
-msgstr "Contenuto non trovato"
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Impossibile leggere il file"
 
-#: src/datastore/gnunet-service-datastore.c:1019
-msgid "# bytes removed (explicit request)"
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
-msgid "# REMOVE requests received"
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/cli/namestore/gnunet-namestore.c:1302
 #, c-format
 msgid ""
-"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/cli/namestore/gnunet-namestore.c:1327
 #, c-format
-msgid "New payload: %lld\n"
+msgid "%s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/cli/namestore/gnunet-namestore.c:1356
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "No options given\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/cli/namestore/gnunet-namestore.c:1370
 #, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1236
-msgid "Bloomfilter construction complete.\n"
+msgid "Recordlines only work with option `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/cli/namestore/gnunet-namestore.c:1381
+msgid "name"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/cli/namestore/gnunet-namestore.c:1410
 #, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
+msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1472
-msgid "# quota"
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
-msgid "# cache size"
-msgstr "# dimensione cache"
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, c-format
+msgid "Unsupported type `%s'\n"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/cli/namestore/gnunet-namestore.c:1471
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/cli/namestore/gnunet-namestore.c:1491
 #, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1573
-msgid "Failed to initialize bloomfilter.\n"
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, c-format
+msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:895
-msgid "Heap database running\n"
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
-msgid "Postgresql exec failure"
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
-msgid "Failed to drop table from database.\n"
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:87
-#, c-format
-msgid "`%s' failed at %s:%u with error: %s"
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
+#: src/cli/namestore/gnunet-namestore.c:1642
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:634
-msgid "sqlite bind failure"
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
-msgid "Data too large"
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, c-format
+msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, c-format
+msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
-msgid "error preparing statement\n"
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, c-format
+msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
-#, fuzzy
-msgid "error stepping\n"
-msgstr "# elementi memorizzati"
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
-#, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-msgid "Sqlite database running\n"
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:252
-msgid "Template database running\n"
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
+#: src/cli/namestore/gnunet-namestore.c:2004
 msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:167
-#, c-format
-msgid "Result %d, type %d:\n"
+#: src/cli/namestore/gnunet-namestore.c:2010
+msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
+#: src/cli/namestore/gnunet-namestore.c:2015
+msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, c-format
-msgid "Failed to connect to DHT service!\n"
+#: src/cli/namestore/gnunet-namestore.c:2025
+msgid "Output in recordline format"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:256
-msgid "Issuing DHT GET with key"
+#: src/cli/namestore/gnunet-namestore.c:2031
+msgid "determine our name for the given KEY"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-msgid "use DHT's record route option"
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
+#: src/cli/namestore/gnunet-namestore.c:2056
+msgid "omit private records"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
 msgstr ""
 
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+msgid "Suggested configuration changes:\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:140
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
 #, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/dht/gnunet-dht-put.c:151
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "Wrote updated configuration to `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+msgid "run autoconfiguration"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:925
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+msgid "GNUnet NAT traversal autoconfiguration"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-msgid "number of peers to start"
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "number of PUTs to perform per peer"
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
-msgid "name of the file with the login information for the testbed"
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:976
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
-msgid "delay to start doing PUTs (default: 1 sec)"
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
-msgid "delay to start doing GETs (default: 5 min)"
+#: src/cli/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
-msgid "replication degree for DHT PUTs"
+#: src/cli/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
-msgid "chance that a peer is selected at random for PUTs"
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
-msgid "Measure quality and performance of the DHT service."
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
-msgid "only monitor DNS queries"
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:387
-msgid "Monitor DNS queries."
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:240
-msgid "set A records"
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:246
-msgid "set AAAA records"
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:259
-msgid "Change DNS replies to point elsewhere."
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:463
-msgid "# DNS requests answered via TUN interface"
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:617
-msgid "# DNS exit failed (failed to open socket)"
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:753
-msgid "# External DNS response discarded (no matching request)"
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, c-format
+msgid "Ego is required\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:829
-msgid "# Client response discarded (no matching request)"
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:951
-msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, c-format
+msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:970
-msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:981
-#, c-format
-msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:993
-msgid "DNS interceptor got non-DNS packet (dropped)\n"
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
-msgid "# Non-DNS UDP packet received via TUN interface"
+#: src/cli/reclaim/gnunet-reclaim.c:852
+msgid "The EGO to use"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1066
-msgid "# DNS requests received via TUN interface"
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
-msgid "need a valid IPv4 or IPv6 address\n"
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1125
-#, c-format
-msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
-msgid "# TCP packets sent via TUN"
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1074
-msgid "# ICMP packets sent via TUN"
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1368
-msgid "# UDP packets sent via TUN"
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
-#, fuzzy
-msgid "# Bytes received from CADET"
-msgstr "# byte ricevuti via SMTP"
-
-#: src/exit/gnunet-daemon-exit.c:1504
-#, fuzzy
-msgid "# UDP IP-exit requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/exit/gnunet-daemon-exit.c:1616
-#, fuzzy
-msgid "# UDP service requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/exit/gnunet-daemon-exit.c:1658
-#, fuzzy
-msgid "# TCP service creation requests received via cadet"
-msgstr "# connessioni attive"
-
-#: src/exit/gnunet-daemon-exit.c:1749
-#, fuzzy
-msgid "# TCP IP-exit creation requests received via cadet"
-msgstr "# connessioni attive"
-
-#: src/exit/gnunet-daemon-exit.c:1837
-msgid "# TCP DATA requests dropped (no session)"
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1876
-#, fuzzy
-msgid "# TCP data requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/exit/gnunet-daemon-exit.c:2017
-#, fuzzy
-msgid "# ICMP IP-exit requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2287
-#, fuzzy
-msgid "# ICMP service requests received via cadet"
-msgstr "# messaggi PONG ricevuti"
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/cli/revocation/gnunet-revocation.c:114
 #, fuzzy
-msgid "# Inbound CADET channels created"
-msgstr "# messaggi PONG decrittati"
+msgid "Shutting down...\n"
+msgstr "Avvio di %s in corso...\n"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/cli/revocation/gnunet-revocation.c:146
 #, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636
-#, fuzzy
-msgid "# Messages transmitted via cadet channels"
-msgstr "# Messaggi PING trasmessi"
-
-#: src/exit/gnunet-daemon-exit.c:2828
-msgid "# ICMP packets dropped (not allowed)"
+#: src/cli/revocation/gnunet-revocation.c:150
+#, c-format
+msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2837
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/cli/revocation/gnunet-revocation.c:154
+msgid "Internal error\n"
+msgstr "Errore interno\n"
+
+#: src/cli/revocation/gnunet-revocation.c:180
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2913
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/cli/revocation/gnunet-revocation.c:183
+msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2987
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/cli/revocation/gnunet-revocation.c:189
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3036
-msgid "# Packets received from TUN"
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3051
-msgid "# Bytes received from TUN"
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3078
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/cli/revocation/gnunet-revocation.c:302
 #, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/cli/revocation/gnunet-revocation.c:334
 #, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/cli/revocation/gnunet-revocation.c:350
 #, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgid "Error: Key is invalid\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/cli/revocation/gnunet-revocation.c:357
 #, c-format
-msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
-#, c-format
-msgid "`%s' is not a valid port number (for domain `%s')!"
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
-#, c-format
-msgid "No addresses found for hostname `%s' of service `%s'!\n"
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
-#, c-format
-msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/cli/revocation/gnunet-revocation.c:424
 #, c-format
-msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
+msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/cli/revocation/gnunet-revocation.c:434
 msgid ""
-"This system does not support IPv4, will disable IPv4 functions despite them "
-"being enabled in the configuration\n"
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3646
-msgid ""
-"This system does not support IPv6, will disable IPv6 functions despite them "
-"being enabled in the configuration\n"
+#: src/cli/revocation/gnunet-revocation.c:464
+msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
-msgid ""
-"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
-"ENABLE_IPv4=YES\n"
+#: src/cli/revocation/gnunet-revocation.c:481
+#, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3661
-msgid ""
-"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
-"ENABLE_IPv6=YES\n"
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3832
-msgid "Must be a number"
-msgstr "Deve essere un numero"
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
+msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3948
-#, c-format
-msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
-msgid "No useful service enabled.  Exiting.\n"
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4114
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/fs/fs_api.c:481
-#, c-format
-msgid "Could not open file `%s': %s"
+#: src/cli/revocation/gnunet-revocation.c:558
+msgid "number of epochs to calculate for"
 msgstr ""
 
-#: src/fs/fs_api.c:492
-#, c-format
-msgid "Could not read file `%s': %s"
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
+msgid "help text"
 msgstr ""
 
-#: src/fs/fs_api.c:500
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1157
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
 #, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1708
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/fs/fs_api.c:1723
-#, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2452
+#: src/cli/statistics/gnunet-statistics.c:577
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2463
+#: src/cli/statistics/gnunet-statistics.c:589
 #, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
+msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/cli/statistics/gnunet-statistics.c:725
 #, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
+msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2629
+#: src/cli/statistics/gnunet-statistics.c:742
 #, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
+msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/cli/statistics/gnunet-statistics.c:751
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2847
+#: src/cli/statistics/gnunet-statistics.c:783
 #, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3108
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/fs/fs_directory.c:216
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/fs/fs_download.c:311
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/fs/fs_download.c:333
-msgid "Directory too large for system address space\n"
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
 msgstr ""
 
-#: src/fs/fs_download.c:347
-#, c-format
-msgid ""
-"Failed to access full directory contents of `%s' for recursive download\n"
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
-#, c-format
-msgid "Failed to open file `%s' for writing"
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
 msgstr ""
 
-#: src/fs/fs_download.c:961
-#, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
 msgstr ""
 
-#: src/fs/fs_download.c:1045
-#, c-format
-msgid ""
-"Internal error or bogus download URI (expected %lu bytes at depth %u and "
-"offset %llu/%llu, got %lu bytes)"
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
 msgstr ""
 
-#: src/fs/fs_download.c:1067
-msgid "internal error decrypting content"
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
 msgstr ""
 
-#: src/fs/fs_download.c:1090
-#, c-format
-msgid "Download failed: could not open file `%s': %s"
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/fs/fs_download.c:1101
-#, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s"
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/fs/fs_download.c:1111
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/fs/fs_download.c:1219
-msgid "internal error decoding tree"
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
 msgstr ""
 
-#: src/fs/fs_download.c:1890
-msgid "Invalid URI"
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/fs/fs_getopt.c:237
-#, c-format
+#: src/cli/util/gnunet-config.c:171
 msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:191
-#, c-format
-msgid "Failed to not connect to `%s' service.\n"
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/fs/fs_misc.c:129
-#, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
+#: src/cli/util/gnunet-config.c:192
+msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/fs/fs_namespace.c:203
-#, c-format
-msgid "Failed to open `%s' for writing: %s\n"
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
 msgstr ""
 
-#: src/fs/fs_namespace.c:234
+#: src/cli/util/gnunet-ecc.c:95
 #, c-format
-msgid "Failed to write `%s': %s\n"
+msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:331
+#: src/cli/util/gnunet-ecc.c:129
 #, c-format
-msgid "Failed to read `%s': %s\n"
+msgid "Generating %u keys like %s, please wait"
 msgstr ""
 
-#: src/fs/fs_namespace.c:458
-msgid "Failed to connect to datastore."
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/cli/util/gnunet-ecc.c:178
 #, c-format
-msgid "Publishing failed: %s"
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:732
-#, fuzzy, c-format
-msgid "Can not index file `%s': %s.\n"
-msgstr "Connessione stabilita con `%s'\n"
-
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/cli/util/gnunet-ecc.c:185
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid ""
+"\n"
+"Finished!\n"
 msgstr ""
+"\n"
+"Completato!\n"
 
-#: src/fs/fs_publish.c:791
-#, fuzzy
-msgid "error on index-start request to `fs' service"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/fs/fs_publish.c:837
-msgid "failed to compute hash"
-msgstr "impossibile calcolare l'hash"
-
-#: src/fs/fs_publish.c:857
-msgid "filename too long"
-msgstr "nome file troppo lungo"
-
-#: src/fs/fs_publish.c:889
-msgid "could not connect to `fs' service"
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/cli/util/gnunet-ecc.c:304
 #, c-format
-msgid "Failed to get file identifiers for `%s'\n"
+msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
-msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+#: src/cli/util/gnunet-ecc.c:314
+#, c-format
+msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
 #, c-format
-msgid "Recursive upload failed at `%s': %s"
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1116
+#: src/cli/util/gnunet-ecc.c:334
 #, c-format
-msgid "Recursive upload failed: %s"
+msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1157
-msgid "needs to be an actual file"
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1397
-#, c-format
-msgid "Datastore failure: %s"
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1489
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:213
-msgid "Could not connect to datastore."
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:215
-msgid "Internal error."
-msgstr "Errore interno."
-
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
-#, c-format
-msgid "Failed to parse URI `%s': %s\n"
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/fs/fs_search.c:994
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+#: src/cli/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
-msgid "Failed to find given position in file"
+#: src/cli/util/gnunet-ecc.c:479
+msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/fs/fs_unindex.c:69
-msgid "Failed to read file"
-msgstr "Impossibile leggere il file"
-
-#: src/fs/fs_unindex.c:276
-msgid "Error communicating with `fs' service."
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:327
-msgid "Failed to connect to FS service for unindexing."
+#: src/cli/util/gnunet-ecc.c:499
+msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
-msgid "Failed to get KSKs from directory scan."
-msgstr ""
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Impossibile leggere il file"
 
-#: src/fs/fs_unindex.c:386
+#: src/cli/util/gnunet-qr.c:134
 #, c-format
-msgid "Internal error scanning `%s'.\n"
+msgid "Added URI %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:447
+#: src/cli/util/gnunet-qr.c:161
 #, c-format
-msgid "Failed to remove UBlock: %s\n"
+msgid "Invalid URI: does not start with `gnunet://'\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
-msgid "Failed to connect to `datastore' service."
+#: src/cli/util/gnunet-qr.c:171
+#, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:670
-msgid "Failed to open file for unindexing."
+#: src/cli/util/gnunet-qr.c:182
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:709
-msgid "Failed to compute hash of file."
-msgstr "Impossibile calcolare l'hash del file."
+#: src/cli/util/gnunet-qr.c:218
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/fs/fs_uri.c:232
-#, no-c-format
-msgid "Malformed KSK URI (`%' must be followed by HEX number)"
-msgstr ""
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/fs/fs_uri.c:291
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr ""
+#: src/cli/util/gnunet-qr.c:261
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Avvio di %s in corso...\n"
 
-#: src/fs/fs_uri.c:309
-msgid "Malformed KSK URI (`++' not allowed)"
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
-msgid "Malformed KSK URI (quotes not balanced)"
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
+#, c-format
+msgid "Got %d images\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:383
-msgid "Malformed SKS URI (wrong syntax)"
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
+#, c-format
+msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:424
-msgid "Malformed CHK URI (wrong syntax)"
-msgstr ""
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/fs/fs_uri.c:441
-msgid "Malformed CHK URI (failed to decode CHK)"
-msgstr ""
+#: src/cli/util/gnunet-qr.c:546
+#, fuzzy
+msgid "No data found\n"
+msgstr "upnpc non trovato\n"
 
-#: src/fs/fs_uri.c:518
-msgid "LOC URI malformed (wrong syntax)"
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:535
-msgid "LOC URI malformed (no CHK)"
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
-msgid "LOC URI malformed (missing LOC)"
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
-msgid "LOC URI malformed (wrong syntax for public key)"
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
 msgstr ""
 
-#: src/fs/fs_uri.c:562
-msgid "LOC URI malformed (could not decode public key)"
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/fs/fs_uri.c:568
-msgid "LOC URI malformed (could not find signature)"
+#: src/cli/util/gnunet-resolver.c:183
+msgid "Use built-in GNUnet stub resolver"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
-msgid "LOC URI malformed (wrong syntax for signature)"
+#: src/cli/util/gnunet-scrypt.c:215
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "LOC URI malformed (could not decode signature)"
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+msgid "Value is too large.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
-msgid "LOC URI malformed (wrong syntax for expiration time)"
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/fs/fs_uri.c:599
-msgid "LOC URI malformed (could not parse expiration time)"
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/fs/fs_uri.c:613
-msgid "LOC URI malformed (signature failed validation)"
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/fs/fs_uri.c:646
-msgid "invalid argument"
-msgstr "argomento non valido"
-
-#: src/fs/fs_uri.c:666
-msgid "Unrecognized URI type"
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
 msgstr ""
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
-msgid "No keywords specified!\n"
+#: src/cli/util/gnunet-scrypt.c:313
+msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/fs/fs_uri.c:1094
-msgid "Number of double-quotes not balanced!\n"
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:234
+#: src/cli/util/gnunet-uri.c:95
 #, c-format
-msgid "Failed to load state: %s\n"
+msgid "Invalid URI: does not start with `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
+#: src/cli/util/gnunet-uri.c:102
 #, c-format
-msgid "Failed to save state to file %s\n"
+msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/cli/util/gnunet-uri.c:109
 #, c-format
-msgid "Publication of `%s' done\n"
+msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:480
-#, c-format
-msgid "Publishing `%s'\n"
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:491
-#, c-format
-msgid "Failed to run `%s'\n"
+#: src/cli/vpn/gnunet-vpn.c:142
+msgid "Error creating tunnel\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:661
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
 #, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
+#: src/cli/vpn/gnunet-vpn.c:202
+#, c-format
+msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/cli/vpn/gnunet-vpn.c:216
+#, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
+#: src/cli/vpn/gnunet-vpn.c:239
+#, c-format
+msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
+#: src/cli/vpn/gnunet-vpn.c:258
+#, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:668
-msgid "Daemon to use file-sharing to measure its performance."
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:106
-#, c-format
-msgid "Directory `%s' meta data:\n"
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:109
-#, c-format
-msgid "Directory `%s' contents:\n"
+#: src/cli/vpn/gnunet-vpn.c:334
+msgid "service is offered via TCP"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:146
-msgid "You must specify a filename to inspect.\n"
+#: src/cli/vpn/gnunet-vpn.c:339
+msgid "service is offered via UDP"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:160
-#, c-format
-msgid "Failed to read directory `%s'\n"
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:170
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
 #, c-format
-msgid "`%s' is not a GNUnet directory\n"
+msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:201
-msgid "Display contents of a GNUnet directory"
+#: src/contrib/service/abd/gnunet-abd.c:566
+msgid "Ego does not exist!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:131
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
 #, c-format
-msgid "Starting download `%s'.\n"
+msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:143
-msgid "<unknown time>"
-msgstr ""
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/fs/gnunet-download.c:155
+#: src/contrib/service/abd/gnunet-abd.c:865
 #, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
+msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:177
+#: src/contrib/service/abd/gnunet-abd.c:872
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "ego required\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/contrib/service/abd/gnunet-abd.c:882
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
+#: src/contrib/service/abd/gnunet-abd.c:890
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
-msgid "You need to specify a URI argument.\n"
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
+#: src/contrib/service/abd/gnunet-abd.c:983
 #, c-format
-msgid "Failed to parse URI: %s\n"
+msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1011
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
 msgstr ""
 
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, c-format
-msgid "Could not initialize `%s' subsystem.\n"
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/contrib/service/abd/gnunet-abd.c:1025
+msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/contrib/service/abd/gnunet-abd.c:1030
+msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
 msgstr ""
 
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:211
-msgid "run the experiment with COUNT peers"
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:218
-msgid "specifies name of a file with the HOSTS the testbed should use"
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:225
-msgid "automatically terminate experiment after DELAY"
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:237
-msgid "run a testbed to measure file-sharing performance"
+#: src/contrib/service/abd/gnunet-abd.c:1098
+msgid "GNUnet abd resolver tool"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:247
-#, c-format
-msgid "Error publishing: %s.\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:259
-#, c-format
-msgid "URI is `%s'.\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
 msgstr ""
-"L'URI è `%s'.\n"
-"\n"
 
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
 msgstr ""
-"L'URI è `%s'.\n"
-"\n"
 
-#: src/fs/gnunet-publish.c:280
-msgid "Starting cleanup after abort\n"
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:287
-msgid "Cleanup after abort completed.\n"
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
+msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:292
-msgid "Cleanup after abort failed.\n"
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:426
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
-msgid "Meta data for file `%s' (%s)\n"
+msgid ""
+"\n"
+"ew are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:428
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
-msgid "Keywords for file `%s' (%s)\n"
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
-msgid "Could not publish\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:264
+#, c-format
+msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
-msgid "Could not start publishing.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:287
+#, c-format
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:645
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
-msgid "Scanning directory `%s'.\n"
+msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:647
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
-msgid "Scanning file `%s'.\n"
+msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
+msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:659
-msgid "Preprocessing complete.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:356
+msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:665
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:671
-msgid "Meta data extraction has finished.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:391
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "Errore interno."
+#: src/contrib/service/conversation/gnunet-conversation.c:398
+#, c-format
+msgid "Connection established to `%s'\n"
+msgstr "Connessione stabilita con `%s'\n"
 
-#: src/fs/gnunet-publish.c:706
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, c-format
-msgid "Selected pseudonym `%s' unknown\n"
+msgid "Failed to resolve `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:738
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, c-format
-msgid "Failed to access `%s': %s\n"
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:420
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
-msgid "Cannot extract metadata from a URI!\n"
+msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:818
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
-msgid "You must specify one and only one filename for insertion.\n"
+msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:824
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, c-format
-msgid "You must NOT specify an URI and a filename.\n"
+msgid "Unknown command `%s'\n"
+msgstr "Comando `%s' sconosciuto.\n"
+
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
+#, c-format
+msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:907
-msgid "enable adding the creation time to the metadata of the uploaded file"
+#: src/contrib/service/conversation/gnunet-conversation.c:548
+#, c-format
+msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/contrib/service/conversation/gnunet-conversation.c:607
+#, c-format
+msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:921
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/contrib/service/conversation/gnunet-conversation.c:622
+#, c-format
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:928
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/contrib/service/conversation/gnunet-conversation.c:649
+msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/contrib/service/conversation/gnunet-conversation.c:673
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+#: src/contrib/service/conversation/gnunet-conversation.c:680
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:953
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:965
+#: src/contrib/service/conversation/gnunet-conversation.c:696
+#, c-format
 msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:972
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/contrib/service/conversation/gnunet-conversation.c:705
+#, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:980
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/contrib/service/conversation/gnunet-conversation.c:711
+#, c-format
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:998
-msgid "Publish a file or directory on GNUnet"
+#: src/contrib/service/conversation/gnunet-conversation.c:728
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:446
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+msgid "#%u: `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:535
-#, c-format
-msgid "Error searching: %s.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
+msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
+msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:602
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
+msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:608
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
-msgid "An output file is mandatory for silent mode.\n"
+msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:629
-msgid "Could not create keyword URI from arguments.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:858
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:891
+msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:662
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
+msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:676
-msgid "Could not start searching.\n"
+#: src/contrib/service/conversation/gnunet-conversation.c:914
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:702
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+#: src/contrib/service/conversation/gnunet-conversation.c:941
+msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
+#: src/contrib/service/conversation/gnunet-conversation.c:942
+msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
+#: src/contrib/service/conversation/gnunet-conversation.c:945
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
+#: src/contrib/service/conversation/gnunet-conversation.c:948
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/fs/gnunet-search.c:733
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
+#: src/contrib/service/conversation/gnunet-conversation.c:955
+msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
+#: src/contrib/service/conversation/gnunet-conversation.c:958
+msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
+#: src/contrib/service/conversation/gnunet-conversation.c:961
+msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
+#: src/contrib/service/conversation/gnunet-conversation.c:964
+msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/fs/gnunet-search.c:776
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-msgid "Search for files that have been published on GNUnet\n"
+msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
-msgid "# client searches active"
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
+#, c-format
+msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:423
-msgid "# replies received for local clients"
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
+msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
-msgid "# Loopback routes suppressed"
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:785
-msgid "# client searches received"
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
+msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:825
-msgid "# client searches updated (merged content seen list)"
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
+msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:1237
-msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, c-format
-msgid "Failed to connect to `%s' service.\n"
+msgid "pa_stream_write() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
-#, fuzzy
-msgid "# replies received via cadet"
-msgstr "# byte ricevuti via SMTP"
-
-#: src/fs/gnunet-service-fs_cadet_client.c:369
-#, fuzzy
-msgid "# replies received via cadet dropped"
-msgstr "# ACK ricevuti"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:263
-msgid "# queries received via CADET not answered"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
-msgid "# Blocks transferred via cadet"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
+msgid "Connection established.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
-#, fuzzy
-msgid "# queries received via cadet"
-msgstr "# byte ricevuti via SMTP"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:387
-#, fuzzy
-msgid "# cadet client connections rejected"
-msgstr "# connessioni attive"
-
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
-#, fuzzy
-msgid "# cadet connections active"
-msgstr "# connessioni attive"
-
-#: src/fs/gnunet-service-fs_cp.c:539
-msgid "# migration stop messages received"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
+#, c-format
+msgid "pa_stream_new() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
+msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
-msgid "# P2P searches active"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
+#, c-format
+msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:671
-msgid "# artificial delays introduced (ms)"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
+msgid "Wrong Spec\n"
+msgstr "Specifiche errate\n"
 
-#: src/fs/gnunet-service-fs_cp.c:868
-msgid "# requests done for free (low load)"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
+msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
-msgid "# request dropped, priority insufficient"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
+msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:903
-msgid "# requests done for a price (normal load)"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
+#, c-format
+msgid "pa_context_connect() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1000
-msgid "# requests dropped due to higher-TTL request"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
+msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1058
-msgid "# GET requests received (from other peers)"
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
+#, c-format
+msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1082
-msgid "# requests dropped due to missing reverse route"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
+#, c-format
+msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1096
-msgid "# requests dropped due to full reply queue"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
+#, c-format
+msgid "pa_stream_peek() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1153
-msgid "# requests dropped due TTL underflow"
-msgstr ""
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
+msgid "Got signal, exiting.\n"
+msgstr "Segnale ricevuto. Uscita in corso.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1197
-msgid "# P2P query messages received and processed"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
+msgid "Stream successfully created.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1541
-msgid "# migration stop messages sent"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
+#, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
-msgid "Could not open `%s'.\n"
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
-msgid "Error writing `%s'.\n"
-msgstr "Errore durante la scrittura di `%s'.\n"
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, c-format
-msgid "Failed to delete bogus block: %s\n"
+msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:296
-msgid "# index blocks removed: original file inaccessible"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
+#, c-format
+msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgid "pa_stream_connect_record() failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:314
-msgid "not indexed"
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
+msgid "ogg_stream_init() failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
+#, fuzzy, c-format
+msgid "Failed to allocate %u bytes for second packet\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
+msgid "Could not open line, port %s already in use!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:434
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+#: src/contrib/service/conversation/microphone.c:118
+msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:260
-msgid "# average retransmission delay (ms)"
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
+#, c-format
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:422
-msgid "# delay heap timeout (ms)"
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
+#, c-format
+msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query plans executed"
+#: src/contrib/service/conversation/speaker.c:73
+msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:462
-msgid "# query messages sent to other peers"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
+msgid "number of peers to start"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:530
-msgid "# requests merged"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:540
-msgid "# requests refreshed"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
+msgid "timeout for the profiling"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
-msgid "# query plan entries"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
+msgid "number of PeerIDs to request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:305
-msgid "# Pending requests created"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
-msgid "# Pending requests active"
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:795
-msgid "# replies received and matched"
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:869
-msgid "# results found locally"
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
-msgid "# Datastore `PUT' failures"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
+msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1032
-msgid "# storage requests dropped due to high load"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1073
-msgid "# Replies received from DHT"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1228
-msgid "# Replies received from CADET"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
 #, c-format
-msgid "Datastore lookup already took %s!\n"
+msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
 #, c-format
-msgid "On-demand lookup already took %s!\n"
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1433
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1488
-msgid "# Datastore lookups concluded (no results)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1503
-msgid "# Datastore lookups concluded (seen all)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1526
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
-msgid "# on-demand blocks matched requests"
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
+msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
-msgid "# on-demand lookups performed successfully"
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1570
-msgid "# on-demand lookups failed"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
+msgid "number of peers in consensus"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1616
-msgid "# Datastore lookups concluded (found last result)"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629
-msgid "# Datastore lookups concluded (load too high)"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
-msgid "# Datastore lookups initiated"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1744
-msgid "# GAP PUT messages received"
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:643
-msgid "time required, content pushing disabled"
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+msgid "number of element in set B-A"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:103
-#, c-format
-msgid "Error unindexing: %s.\n"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:109
-msgid "Unindexing done.\n"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:142
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:162
-msgid "Could not start unindex operation.\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+msgid "number of values"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
-msgid "metadata length"
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
 msgstr ""
 
-#: src/fs/meta_data.c:1092
-#, fuzzy, c-format
-msgid "Failed to deserialize metadata `%s'"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
+msgstr ""
 
-#: src/fs/meta_data.c:1124
-#, c-format
-msgid "Serialized %ld bytes of metadata"
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
 msgstr ""
 
-#: src/fs/meta_data.c:1131
-#, fuzzy, c-format
-msgid "Failed to serialize metadata `%s'"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Comando `%s' sconosciuto.\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
 msgid "Communication with service failed."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "Contenuto non trovato"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Comando `%s' sconosciuto.\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# connessioni attive"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "Contenuto non trovato"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "upnpc non trovato\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Impossibile avviare il servizio.\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
 msgid "No records given."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
 msgid "No label given."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
 msgid "No results given."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Impossibile avviare il servizio.\n"
 
 #: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
-#: src/gns/gns_tld_api.c:292
-msgid "Expected a base32-encoded public zone key\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
-#, fuzzy, c-format
-msgid "Invalid port number %u\n"
-msgstr "# messaggi PONG ricevuti"
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
-#, fuzzy
-msgid "Unable to set up the daemon\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
-msgid "Failed to start HTTP server\n"
-msgstr "Impossibile avviare il server HTTP\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
 
-#: src/gns/gnunet-bcd.c:660
-msgid "Run HTTP server on port PORT (default is 8888)"
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
-msgid "GNUnet HTTP server to create business cards"
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
-msgid "Failed to pack DNS response into UDP packet!\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:377
-#, fuzzy
-msgid "Failed to parse DNS response!\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
 #, c-format
-msgid "VPN returned empty result for `%s'\n"
+msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/lib/hello/gnunet-hello.c:310
 #, c-format
-msgid "Cannot parse DNS request from %s\n"
+msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/lib/hello/gnunet-hello.c:315
 #, c-format
-msgid "Received malformed DNS request from %s\n"
+msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
 #, c-format
-msgid "Received unsupported DNS request from %s\n"
+msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:839
-msgid "No DNS server specified!\n"
+#: src/lib/hello/gnunet-hello.c:339
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:999
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/lib/hello/gnunet-hello.c:386
+#, c-format
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1016
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/lib/hello/gnunet-hello.c:395
+#, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
-msgid "how long to wait between queries"
+#: src/lib/hello/gnunet-hello.c:409
+msgid "Hello file to read"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
-msgid "how long to wait for an answer"
+#: src/lib/hello/gnunet-hello.c:418
+msgid "Print information about peers."
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
-msgid "look for GNS2DNS records instead of ANY"
+#: src/lib/hello/hello.c:1089
+msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
-msgid "This program will import some GNS authorities into your GNS namestore."
+#: src/lib/hello/hello.c:1099
+msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+#: src/lib/hello/hello.c:1109
+msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:979
-#, c-format
-msgid "Unsupported CURL TLS backend %d\n"
+#: src/lib/hello/hello.c:1121
+msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/lib/hello/hello.c:1139
 #, c-format
-msgid "Failed to fetch CN from cert: %s\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/lib/hello/hello.c:1147
 #, c-format
-msgid "Failed to initialize DANE: %s\n"
+msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/lib/hello/hello.c:1162
 #, c-format
-msgid "Failed to parse DANE record: %s\n"
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/lib/sq/sq.c:47
 #, c-format
-msgid "Failed to verify TLS connection using DANE: %s\n"
+msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1067
-#, c-format
-msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
-#, c-format
-msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Errore di lettura da '%s': %s\n"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr "Fine del file"
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Errore di lettura del file `%s'\n"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/lib/util/bio.c:312
 #, c-format
-msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgid "Invalid handle type while reading `%s'"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
+
+#: src/lib/util/bio.c:345
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Errore di lettura del file `%s'\n"
+
+#: src/lib/util/bio.c:350
 #, c-format
-msgid "Unsupported HTTP method `%s'\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/lib/util/bio.c:363
 #, c-format
-msgid "Unable to import private key from file `%s'\n"
+msgid "String `%s' longer than allowed (%u > %lu)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
 #, fuzzy, c-format
-msgid "Unable to import certificate from `%s'\n"
-msgstr "Generazione statistiche fallita\n"
+msgid "Error while writing `%s' to file: %s"
+msgstr "Errore di lettura del file `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:2895
-#, c-format
-msgid "Failed to start HTTPS server for `%s'\n"
+#: src/lib/util/bio.c:689
+msgid "No associated file"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
-msgid "Failed to pass client to MHD\n"
+#: src/lib/util/bio.c:773
+#, c-format
+msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
 #, c-format
-msgid "Unsupported socks version %d\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
 #, c-format
-msgid "Unsupported socks command %d\n"
+msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
 #, c-format
-msgid "Unsupported socks address type %d\n"
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
 #, c-format
-msgid "Failed to load X.509 key and certificate from `%s'\n"
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3868
-msgid "listen on specified port (default: 7777)"
+#: src/lib/util/common_logging.c:910
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3873
-msgid "pem file to use as CA"
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "ERRORE"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "ATTENZIONE"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3877
-msgid "disable use of IPv6"
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "INFO"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr "NESSUNA"
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr "NON VALIDO"
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr "indirizzo sconosciuto"
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr "indirizzo non valido"
+
+#: src/lib/util/common_logging.c:1416
+#, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
-msgid "GNUnet GNS proxy"
+#: src/lib/util/common_logging.c:1431
+#, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
+#: src/lib/util/configuration.c:1073
 #, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+#: src/lib/util/configuration.c:1718
+msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:304
+#: src/lib/util/configuration_helper.c:134
 #, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
+#: src/lib/util/configuration_helper.c:148
+#, c-format
+msgid "%s, %s or %s argument is required\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:351
-msgid "Specify a timeout for the lookup"
+#: src/lib/util/configuration_helper.c:263
+#, c-format
+msgid "failed to load configuration defaults"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:374
-msgid "GNUnet GNS resolver tool"
+#: src/lib/util/crypto_ecc.c:554
+#, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:518
-#, fuzzy
-msgid "Properly base32-encoded public key required"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
-msgid "Failed to connect to the namecache!\n"
+#: src/lib/util/crypto_ecc.c:677
+#, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
-msgid "Could not connect to DHT!\n"
+#: src/lib/util/crypto_ecc_setup.c:282
+msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
-msgid "Error converting GNS response to DNS response!\n"
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
-msgid "Failed to connect to the DNS service!\n"
+#: src/lib/util/crypto_rsa.c:908
+#, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/lib/util/crypto_rsa.c:1208
 #, c-format
-msgid "Protocol `%s' unknown, skipping labels.\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/lib/util/disk.c:843
 #, c-format
-msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
 #, c-format
-msgid "Service `%s' not a port, skipping service labels.\n"
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:900
-msgid "Failed to parse DNS response\n"
+#: src/lib/util/dnsparser.c:910
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/lib/util/dnsstub.c:228
 #, c-format
-msgid "Skipping record of unsupported type %d\n"
+msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/lib/util/dnsstub.c:371
 #, c-format
-msgid "Name `%s' cannot be converted to IDNA."
+msgid "Received DNS response that is too small (%u bytes)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Generazione statistiche fallita\n"
+
+#: src/lib/util/dnsstub.c:509
 #, c-format
-msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/lib/util/getopt.c:566
 #, c-format
-msgid "GNS lookup failed (zero records found for `%s')\n"
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
-msgid "Unable to process critical delegation record\n"
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
-msgid "GNS lookup recursion failed (no delegation record found)\n"
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
 #, c-format
-msgid "Failed to cache GNS resolution: %s\n"
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/lib/util/getopt.c:648
 #, c-format
-msgid "GNS namecache returned empty result for `%s'\n"
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/lib/util/getopt.c:654
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:213
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
 #, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:230
+#: src/lib/util/getopt.c:762
 #, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:254
+#: src/lib/util/getopt.c:782
 #, c-format
-msgid "Unable to parse VPN record string `%s'\n"
+msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/gns/plugin_rest_gns.c:450
-msgid "Gns REST API initialized\n"
+#: src/lib/util/getopt.c:971
+#, c-format
+msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
+#: src/lib/util/getopt.c:984
+#, c-format
+msgid "Option `%s' can't be used with other options.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
+#: src/lib/util/getopt.c:996
+#, c-format
+msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
+#: src/lib/util/getopt_helpers.c:463
+msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
 #, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
+msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
+#: src/lib/util/getopt_helpers.c:571
 #, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
+#: src/lib/util/getopt_helpers.c:578
 #, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
+msgid "Value given for time travel `%s' option is too big.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, c-format
-msgid "Unable to parse SOA record `%s'\n"
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
+#: src/lib/util/getopt_helpers.c:632
 #, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
+#: src/lib/util/getopt_helpers.c:686
 #, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
+msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
+#: src/lib/util/getopt_helpers.c:743
 #, c-format
-msgid "Unable to parse MX record `%s'\n"
+msgid "You must pass a timestamp to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
+#: src/lib/util/getopt_helpers.c:750
 #, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
+msgid "The maximum precision allowed for timestamps is seconds.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
+#: src/lib/util/getopt_helpers.c:876
 #, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
+msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
+#: src/lib/util/getopt_helpers.c:954
 #, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/lib/util/helper.c:304
+#, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/hello/gnunet-hello.c:303
+#: src/lib/util/helper.c:356
 #, c-format
-msgid "Error accessing file `%s': %s\n"
+msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:310
+#: src/lib/util/helper.c:571
 #, c-format
-msgid "File `%s' is too big to be a HELLO\n"
+msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:315
+#: src/lib/util/network.c:163
 #, c-format
-msgid "File `%s' is too small to be a HELLO\n"
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
+#: src/lib/util/network.c:1284
 #, c-format
-msgid "Error opening file `%s': %s\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:339
+#: src/lib/util/os_installation.c:416
 #, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:386
+#: src/lib/util/os_installation.c:787
 #, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:395
+#: src/lib/util/os_installation.c:820
 #, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
+msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:409
-msgid "Hello file to read"
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:418
-msgid "Print information about peers."
+#: src/lib/util/plugin.c:158
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/hello/hello.c:1089
-msgid "Failed to parse HELLO message: missing expiration time\n"
+#: src/lib/util/plugin.c:215
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/hello/hello.c:1099
-msgid "Failed to parse HELLO message: invalid expiration time\n"
+#: src/lib/util/plugin.c:371
+msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/hello/hello.c:1109
-msgid "Failed to parse HELLO message: malformed\n"
+#: src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/hello/hello.c:1121
-msgid "Failed to parse HELLO message: missing transport plugin\n"
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/hello/hello.c:1139
+#: src/lib/util/resolver_api.c:243
 #, c-format
-msgid "Plugin `%s' not found, skipping address\n"
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 
-#: src/hello/hello.c:1147
+#: src/lib/util/resolver_api.c:888
 #, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/hello/hello.c:1162
+#: src/lib/util/resolver_api.c:901
 #, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:306
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/lib/util/resolver_api.c:1086
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
-msgid "advertise our hostlist to other peers"
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, c-format
+msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/lib/util/service.c:654
+#, c-format
 msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
-msgid "enable learning about hostlist servers from other peers"
+#: src/lib/util/service.c:838
+#, c-format
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
-msgid "provide a hostlist server"
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
-msgid "GNUnet hostlist server and client"
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
-msgid "# bytes downloaded from hostlist servers"
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
-msgid "# valid HELLOs downloaded from hostlist servers"
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
-msgid "# advertised hostlist URIs"
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/lib/util/service.c:1401
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/lib/util/service.c:1413
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/lib/util/service.c:1420
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/lib/util/service.c:1481
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/lib/util/service.c:1505
 #, c-format
-msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
-#, c-format
-msgid "Download of hostlist `%s' completed.\n"
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
-#, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+#: src/lib/util/service.c:1644
+msgid "No such user"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/lib/util/service.c:1658
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
-msgid "# hostlist downloads initiated"
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
-msgid "# milliseconds between hostlist downloads"
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
-#, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
-msgid "# active connections"
-msgstr "# connessioni attive"
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+msgid "Malformed configuration, exit ...\n"
+msgstr ""
+
+#: src/lib/util/socks.c:636
 #, c-format
-msgid "Hostlist file `%s' does not exist\n"
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/lib/util/socks.c:653
 #, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/lib/util/strings.c:394
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
-msgid "# hostlist URIs read from file"
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr ""
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1081
 #, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1283
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
-msgid "# hostlist URIs written to file"
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/lib/util/strings.c:1459
 #, c-format
-msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgid "Invalid format: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
-msgid "Learning is enabled on this peer\n"
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
-msgid "Learning is not enabled on this peer\n"
+#: src/lib/util/strings.c:1551
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/lib/util/strings.c:1582
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
-msgid "bytes in hostlist"
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
+#: src/lib/util/time.c:937
 #, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-msgid "Expired HELLO encountered (ignored)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
-msgid "bytes not included in hostlist (size limit)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
-msgid "hostlist requests refused (not HTTP GET)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
-msgid "hostlist requests refused (upload data)"
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
-msgid "hostlist requests refused (not ready)"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
-msgid "Received request for our hostlist\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
-msgid "hostlist requests processed"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, c-format
+msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
-msgid "# hostlist advertisements send"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
-msgid "Could not access PEERSTORE service.  Exiting.\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
-#, fuzzy
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
-#, fuzzy
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
 #, fuzzy, c-format
-msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+msgid "Unable to initialize file: %s.\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
 #, fuzzy, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
+msgid "Unable to get filesize: %s.\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Impossibile leggere il file"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+msgid "flat plugin running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:225
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
 #, c-format
-msgid "Failed to create ego: %s\n"
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+msgid "Flat file database running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+msgid "SQlite database running\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:576
-msgid "reduce output"
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:597
-msgid "display private keys as well"
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+msgid "CONFIG REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+msgid "COPYING REST API initialized\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/arm/gnunet-service-arm.c:391
 #, c-format
-msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/arm/gnunet-service-arm.c:951
 #, c-format
-msgid "Failed to parse ego information in `%s'\n"
+msgid "Failed to start service `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr "Avvio del servizio '%s' in corso\n"
+
+#: src/service/arm/gnunet-service-arm.c:1062
+#, c-format
+msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/arm/gnunet-service-arm.c:1093
 #, c-format
-msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/arm/gnunet-service-arm.c:1124
 #, c-format
-msgid "Failed to create directory `%s' for storing egos\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1245
-msgid "Identity REST API initialized\n"
+#: src/service/arm/gnunet-service-arm.c:1272
+#, c-format
+msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/arm/gnunet-service-arm.c:1604
+#, c-format
+msgid "Restarting service `%s'.\n"
+msgstr ""
 
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
-#, fuzzy, c-format
-msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr "uscita"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
-#, fuzzy, c-format
-msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr ""
 
-#: src/namecache/gnunet-namecache.c:105
+#: src/service/arm/gnunet-service-arm.c:1765
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: src/service/arm/gnunet-service-arm.c:1771
 #, c-format
-msgid "No records found for `%s'"
+msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
+#: src/service/arm/gnunet-service-arm.c:1798
 #, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:174
+#: src/service/arm/gnunet-service-arm.c:1815
 #, c-format
-msgid "You must specify which zone should be accessed\n"
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "# messaggi PONG ricevuti"
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
 
-#: src/namecache/gnunet-namecache.c:187
-#, c-format
-msgid "You must specify a name\n"
-msgstr "È necessario specificare un nome\n"
+#: src/service/core/gnunet-service-core.c:329
+msgid "# send requests dropped (disconnected)"
+msgstr ""
 
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
+#: src/service/core/gnunet-service-core.c:355
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:220
-msgid "specifies the public key of the zone to look in"
+#: src/service/core/gnunet-service-core.c:419
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-msgid "GNUnet zone manipulation tool"
+#: src/service/core/gnunet-service-core.c:505
+msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/namecache/namecache_api.c:283
-msgid "Namecache failed to cache block"
+#: src/service/core/gnunet-service-core.c:824
+#, c-format
+msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/namecache/namecache_api.c:371
-msgid "Error communicating with namecache service"
+#: src/service/core/gnunet-service-core.c:926
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "Generazione statistiche fallita\n"
+msgid "Core service of `%s' ready.\n"
+msgstr "Avvio del servizio '%s' in corso\n"
 
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/service/core/gnunet-service-core_kx.c:511
+msgid "# bytes encrypted"
+msgstr "# byte crittografati"
 
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Impossibile leggere il file"
+#: src/service/core/gnunet-service-core_kx.c:569
+msgid "# bytes decrypted"
+msgstr "# byte decrittati"
 
-#: src/namecache/plugin_namecache_flat.c:404
-msgid "flat plugin running\n"
+#: src/service/core/gnunet-service-core_kx.c:666
+msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/core/gnunet-service-core_kx.c:718
+msgid "# key exchanges initiated"
+msgstr ""
+
+#: src/service/core/gnunet-service-core_kx.c:774
+msgid "# key exchanges stopped"
+msgstr ""
+
+#: src/service/core/gnunet-service-core_kx.c:806
+msgid "# PING messages transmitted"
+msgstr "# Messaggi PING trasmessi"
+
+#: src/service/core/gnunet-service-core_kx.c:865
+msgid "# old ephemeral keys ignored"
+msgstr ""
+
+#: src/service/core/gnunet-service-core_kx.c:880
+#, fuzzy
+msgid "# duplicate ephemeral keys ignored"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
+#: src/service/core/gnunet-service-core_kx.c:917
+#, fuzzy
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr "# messaggi SYN ricevuti"
+
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgid ""
+"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
+#: src/service/core/gnunet-service-core_kx.c:943
+#, fuzzy
+msgid "# EPHEMERAL_KEY messages rejected due to time"
+msgstr "# messaggi SYN ricevuti"
+
+#: src/service/core/gnunet-service-core_kx.c:962
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/service/core/gnunet-service-core_kx.c:1072
+msgid "# PING messages received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
+#: src/service/core/gnunet-service-core_kx.c:1082
+msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
+#: src/service/core/gnunet-service-core_kx.c:1134
+msgid "# PONG messages created"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-msgid "GNUnet namestore database manipulation tool"
+#: src/service/core/gnunet-service-core_kx.c:1159
+msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:373
-msgid "can not search the namestore"
+#: src/service/core/gnunet-service-core_kx.c:1172
+msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
-msgid "unable to scan namestore"
+#: src/service/core/gnunet-service-core_kx.c:1229
+msgid "# PONG messages received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/service/core/gnunet-service-core_kx.c:1237
+msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
-#, fuzzy, c-format
-msgid "Failed to create record for `%s': %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/core/gnunet-service-core_kx.c:1246
+msgid "# PONG messages dropped (out of order)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
-#, fuzzy
-msgid "no errors"
-msgstr "errore sconosciuto"
+#: src/service/core/gnunet-service-core_kx.c:1288
+msgid "# PONG messages decrypted"
+msgstr "# messaggi PONG decrittati"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
-#, c-format
-msgid "The requested key `%s' exists as `%s'\n"
+#: src/service/core/gnunet-service-core_kx.c:1331
+msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
-msgid "key exists"
+#: src/service/core/gnunet-service-core_kx.c:1343
+msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy
-msgid "Error creating record data\n"
-msgstr "Errore interno."
+#: src/service/core/gnunet-service-core_kx.c:1352
+msgid "# rekey operations confirmed via PONG"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
-#, fuzzy
-msgid "unable to store record"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/service/core/gnunet-service-core_kx.c:1521
+msgid "# DATA message dropped (out of order)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
-msgid "Requested name `%s' exists with `%u' records\n"
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
-msgid "name exists\n"
+#: src/service/core/gnunet-service-core_kx.c:1537
+msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
-msgid "unable to process submitted data"
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
+msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
-msgid "the submitted data is invalid"
+#: src/service/core/gnunet-service-core_kx.c:1632
+msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
-#, fuzzy
-msgid "invalid parameters"
-msgstr "argomento non valido"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:834
-#, fuzzy
-msgid "invalid name"
-msgstr "argomento non valido"
+#: src/service/core/gnunet-service-core_kx.c:1679
+msgid "# bytes dropped (ancient message)"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
-#, fuzzy, c-format
-msgid "Unable to parse key %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/core/gnunet-service-core_kx.c:1689
+msgid "# bytes of payload decrypted"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
-#, fuzzy
-msgid "unable to parse key"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
+msgid "# peers connected"
+msgstr "# nodi connessi"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/service/core/gnunet-service-core_sessions.c:285
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
-msgid "No expiration specified for records.\n"
+#: src/service/core/gnunet-service-core_sessions.c:400
+msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
-msgid "No port specified, using default value\n"
+#: src/service/core/gnunet-service-core_sessions.c:418
+msgid "# valid typemap confirmations received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
-msgid "Failed to connect to identity\n"
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
+msgid "# type maps received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
-msgid "name of the zone managed by FCFSD"
+#: src/service/core/gnunet-service-core_typemap.c:217
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
-msgid "GNU Name System First-Come-First-Served name registration service"
+#: src/service/datacache/plugin_datacache_heap.c:492
+msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/service/datastore/datastore_api.c:340
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "Disconnesso da"
 
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "nome file troppo lungo"
+#: src/service/datastore/datastore_api.c:462
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "Disconnesso da"
 
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Impossibile leggere il file"
+#: src/service/datastore/datastore_api.c:565
+msgid "# queue overflows"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/service/datastore/datastore_api.c:595
+msgid "# queue entries created"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+#: src/service/datastore/datastore_api.c:756
+msgid "# status messages received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
+#: src/service/datastore/datastore_api.c:810
+msgid "# Results received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, c-format
-msgid "Data `%s' invalid\n"
+#: src/service/datastore/datastore_api.c:917
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/service/datastore/datastore_api.c:1007
+msgid "# PUT requests executed"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/service/datastore/datastore_api.c:1068
+msgid "# RESERVE requests executed"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-msgid "name of the ego controlling the zone"
+#: src/service/datastore/datastore_api.c:1113
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:411
-#, c-format
-msgid "Missing entries in record line `%s'.\n"
+#: src/service/datastore/datastore_api.c:1171
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Comando `%s' sconosciuto.\n"
+#: src/service/datastore/datastore_api.c:1230
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
+#: src/service/datastore/datastore_api.c:1276
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:434
-#, c-format
-msgid "Error parsing expiration time %s.\n"
+#: src/service/datastore/datastore_api.c:1357
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Indirizzo IPv6 non valido: `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:335
+msgid "# bytes expired"
+msgstr "# byte scaduti"
 
-#: src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "Adding record failed: %s\n"
+#: src/service/datastore/gnunet-service-datastore.c:419
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Impossibile leggere il file"
+#: src/service/datastore/gnunet-service-datastore.c:551
+msgid "# results found"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1138
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, c-format
 msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1259
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
+#: src/service/datastore/gnunet-service-datastore.c:619
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
+msgid "# reserved"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:693
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
+#: src/service/datastore/gnunet-service-datastore.c:743
+msgid "# bytes stored"
+msgstr ""
+
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
-msgid "Missing option `%s' for operation `%s'\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1381
-msgid "name"
+#: src/service/datastore/gnunet-service-datastore.c:858
+msgid "# GET requests received"
+msgstr "# richieste GET ricevute"
+
+#: src/service/datastore/gnunet-service-datastore.c:888
+#, fuzzy
+msgid "# GET KEY requests received"
+msgstr "# richieste GET ricevute"
+
+#: src/service/datastore/gnunet-service-datastore.c:899
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1410
-#, c-format
-msgid "Invalid nick `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:940
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
+#: src/service/datastore/gnunet-service-datastore.c:971
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1461
-#, c-format
-msgid "Unsupported type `%s'\n"
+#: src/service/datastore/gnunet-service-datastore.c:1012
+msgid "Content not found"
+msgstr "Contenuto non trovato"
+
+#: src/service/datastore/gnunet-service-datastore.c:1019
+msgid "# bytes removed (explicit request)"
+msgstr ""
+
+#: src/service/datastore/gnunet-service-datastore.c:1058
+msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1471
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
+msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
-msgid "Invalid time format `%s'\n"
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
+#: src/service/datastore/gnunet-service-datastore.c:1176
+#, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
+#: src/service/datastore/gnunet-service-datastore.c:1236
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
+#: src/service/datastore/gnunet-service-datastore.c:1288
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
+#: src/service/datastore/gnunet-service-datastore.c:1298
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
+#: src/service/datastore/gnunet-service-datastore.c:1472
+msgid "# quota"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1679
+#: src/service/datastore/gnunet-service-datastore.c:1475
+msgid "# cache size"
+msgstr "# dimensione cache"
+
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
-msgid "Invalid URI `%s'\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1967
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, c-format
-msgid "Cannot connect to identity service\n"
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
+#: src/service/datastore/gnunet-service-datastore.c:1573
+msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
+#: src/service/datastore/plugin_datastore_heap.c:895
+msgid "Heap database running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
+msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
+#: src/service/datastore/plugin_datastore_postgres.c:811
+msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
+#: src/service/datastore/plugin_datastore_sqlite.c:87
+#, c-format
+msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2010
-msgid "set the desired nick name for the zone"
+#: src/service/datastore/plugin_datastore_sqlite.c:634
+msgid "sqlite bind failure"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2015
-msgid "monitor changes in the namestore"
+#: src/service/datastore/plugin_datastore_sqlite.c:675
+msgid "Data too large"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2025
-msgid "Output in recordline format"
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2031
-msgid "determine our name for the given KEY"
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
+msgid "error preparing statement\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
+#, fuzzy
+msgid "error stepping\n"
+msgstr "# elementi memorizzati"
+
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
+#, c-format
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
+#: src/service/datastore/plugin_datastore_template.c:252
+msgid "Template database running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
+#: src/service/dht/gnunet_dht_profiler.c:925
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
+#: src/service/dht/gnunet_dht_profiler.c:964
+msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2056
-msgid "omit private records"
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
+msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
+#: src/service/dht/gnunet_dht_profiler.c:976
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
+#: src/service/dht/gnunet_dht_profiler.c:982
+msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
+#: src/service/dht/gnunet_dht_profiler.c:988
+msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
+#: src/service/dht/gnunet_dht_profiler.c:993
+msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
+#: src/service/dht/gnunet_dht_profiler.c:999
+msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
+#: src/service/dht/gnunet_dht_profiler.c:1005
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
+#: src/service/dht/gnunet_dht_profiler.c:1026
+msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
+#: src/service/dns/gnunet-dns-monitor.c:387
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:792
-msgid "Flat file database running\n"
+#: src/service/dns/gnunet-dns-redirector.c:240
+msgid "set A records"
 msgstr ""
 
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/dns/gnunet-dns-redirector.c:246
+msgid "set AAAA records"
+msgstr ""
 
-#: src/namestore/plugin_namestore_sqlite.c:956
-msgid "SQlite database running\n"
+#: src/service/dns/gnunet-dns-redirector.c:259
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1320
-msgid "Namestore REST API initialized\n"
+#: src/service/dns/gnunet-service-dns.c:463
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:189
-msgid "Suggested configuration changes:\n"
+#: src/service/dns/gnunet-service-dns.c:617
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/dns/gnunet-service-dns.c:753
+msgid "# External DNS response discarded (no matching request)"
+msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, c-format
-msgid "Wrote updated configuration to `%s'\n"
+#: src/service/dns/gnunet-service-dns.c:829
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:327
-msgid "run autoconfiguration"
+#: src/service/dns/gnunet-service-dns.c:951
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
+#: src/service/dns/gnunet-service-dns.c:970
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
+#: src/service/dns/gnunet-service-dns.c:981
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
+#: src/service/dns/gnunet-service-dns.c:993
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "write configuration file (for autoconfiguration)"
+#: src/service/dns/gnunet-service-dns.c:996
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:355
-msgid "GNUnet NAT traversal autoconfiguration"
+#: src/service/dns/gnunet-service-dns.c:1066
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
+msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/dns/gnunet-service-dns.c:1125
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
-#, fuzzy
-msgid "NAT test failed to start NAT library\n"
-msgstr "Impossibile avviare il server HTTP\n"
-
-#: src/nat-auto/gnunet-service-nat-auto.c:346
-msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+#: src/service/exit/gnunet-daemon-exit.c:968
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
-msgid "NAT traversal with ICMP Server succeeded.\n"
+#: src/service/exit/gnunet-daemon-exit.c:1074
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
-msgid "NAT traversal with ICMP Server failed.\n"
+#: src/service/exit/gnunet-daemon-exit.c:1368
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
+#, fuzzy
+msgid "# Bytes received from CADET"
+msgstr "# byte ricevuti via SMTP"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:1504
+#, fuzzy
+msgid "# UDP IP-exit requests received via cadet"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:1616
+#, fuzzy
+msgid "# UDP service requests received via cadet"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:1658
+#, fuzzy
+msgid "# TCP service creation requests received via cadet"
+msgstr "# connessioni attive"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
-msgid "upnpc found, enabling its use\n"
+#: src/service/exit/gnunet-daemon-exit.c:1749
+#, fuzzy
+msgid "# TCP IP-exit creation requests received via cadet"
+msgstr "# connessioni attive"
+
+#: src/service/exit/gnunet-daemon-exit.c:1837
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
-msgid "upnpc not found\n"
-msgstr "upnpc non trovato\n"
+#: src/service/exit/gnunet-daemon-exit.c:1876
+#, fuzzy
+msgid "# TCP data requests received via cadet"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:2017
+#, fuzzy
+msgid "# ICMP IP-exit requests received via cadet"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:2287
+#, fuzzy
+msgid "# ICMP service requests received via cadet"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/nat-auto/nat_auto_api.c:73
-msgid "Operation Successful"
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
-msgid "IPC failure"
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
+#, fuzzy
+msgid "# Inbound CADET channels created"
+msgstr "# messaggi PONG decrittati"
 
-#: src/nat-auto/nat_auto_api.c:82
-msgid "Encountered timeout while performing operation"
+#: src/service/exit/gnunet-daemon-exit.c:2616
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
-msgid "detected that we are offline"
-msgstr ""
+#: src/service/exit/gnunet-daemon-exit.c:2636
+#, fuzzy
+msgid "# Messages transmitted via cadet channels"
+msgstr "# Messaggi PING trasmessi"
 
-#: src/nat-auto/nat_auto_api.c:88
-msgid "`upnpc` command not found"
+#: src/service/exit/gnunet-daemon-exit.c:2828
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:91
-msgid "Failed to run `upnpc` command"
+#: src/service/exit/gnunet-daemon-exit.c:2837
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:94
-msgid "`upnpc' command took too long, process killed"
+#: src/service/exit/gnunet-daemon-exit.c:2913
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:97
-msgid "`upnpc' command failed to establish port mapping"
+#: src/service/exit/gnunet-daemon-exit.c:2987
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
-msgid "`external-ip' command not found"
+#: src/service/exit/gnunet-daemon-exit.c:3036
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:103
-msgid "Failed to run `external-ip` command"
+#: src/service/exit/gnunet-daemon-exit.c:3051
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:106
-msgid "`external-ip' command output invalid"
+#: src/service/exit/gnunet-daemon-exit.c:3078
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:109
-msgid "no valid address was returned by `external-ip'"
+#: src/service/exit/gnunet-daemon-exit.c:3109
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
-msgid "Could not determine interface with internal/local network address"
+#: src/service/exit/gnunet-daemon-exit.c:3161
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:116
-msgid "No functioning gnunet-helper-nat-server installation found"
+#: src/service/exit/gnunet-daemon-exit.c:3170
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:119
-msgid "NAT test could not be initialized"
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
+#, c-format
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
-msgid "NAT test timeout reached"
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
-msgid "could not register NAT"
+#: src/service/exit/gnunet-daemon-exit.c:3448
+#, c-format
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
-msgid "No working gnunet-helper-nat-client installation found"
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
-msgid "Failed to find valid PORT in section `%s'\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:489
-#, fuzzy, c-format
-msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/service/exit/gnunet-daemon-exit.c:3637
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
+msgstr ""
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
+#: src/service/exit/gnunet-daemon-exit.c:3646
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
+#: src/service/exit/gnunet-daemon-exit.c:3654
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:438
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
+#: src/service/exit/gnunet-daemon-exit.c:3832
+msgid "Must be a number"
+msgstr "Deve essere un numero"
+
+#: src/service/exit/gnunet-daemon-exit.c:3948
+#, c-format
+msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:464
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/service/exit/gnunet-daemon-exit.c:4114
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/fs/fs_api.c:481
 #, c-format
-msgid "Malformed punched hole specification `%s' (lacks port)\n"
+msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/fs/fs_api.c:492
 #, c-format
-msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
+msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/fs/fs_api.c:500
 #, c-format
-msgid "Malformed punched hole specification `%s' (lacks `]')\n"
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/fs/fs_api.c:1157
 #, c-format
-msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
+msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
-msgid "Connection reversal request failed\n"
+#: src/service/fs/fs_api.c:1708
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1935
-msgid ""
-"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP\n"
+#: src/service/fs/fs_api.c:1723
+#, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/fs/fs_api.c:2452
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/fs/fs_api.c:2463
 #, c-format
-msgid "Failed to start %s\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:188
-msgid "`external-ip' command not found\n"
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
+#, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:602
-msgid "`upnpc' command not found\n"
+#: src/service/fs/fs_api.c:2629
+#, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
-msgid "limit to the number of connections to NSE services, 0 for none"
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864
-msgid "name of the file for writing connection information and statistics"
+#: src/service/fs/fs_api.c:2847
+#, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:879
-msgid "name of the file for writing the main results"
+#: src/service/fs/fs_api.c:3108
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:888
-msgid "Number of peers to run in each round, separated by commas"
+#: src/service/fs/fs_directory.c:216
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
-msgid "delay between rounds"
+#: src/service/fs/fs_download.c:311
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:912
-msgid "Measure quality and performance of the NSE service."
+#: src/service/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
+#: src/service/fs/fs_download.c:347
+#, c-format
+msgid ""
+"Failed to access full directory contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-msgid "Value is too large.\n"
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
+#, c-format
+msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/peerstore/gnunet-peerstore.c:92
-msgid "peerstore"
+#: src/service/fs/fs_download.c:961
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/fs/fs_download.c:1045
 #, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
+msgid ""
+"Internal error or bogus download URI (expected %lu bytes at depth %u and "
+"offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:657
-#, c-format
-msgid "Could not load database backend `%s'\n"
+#: src/service/fs/fs_download.c:1067
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/fs/fs_download.c:1090
 #, c-format
-msgid "Importing HELLOs from `%s'\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:688
-msgid "Skipping import of included HELLOs\n"
+#: src/service/fs/fs_download.c:1101
+#, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
-msgid "Unexpected iteration response, this should not happen.\n"
+#: src/service/fs/fs_download.c:1111
+#, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:781
-msgid "Received a malformed response from service."
+#: src/service/fs/fs_download.c:1219
+msgid "internal error decoding tree"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:895
-msgid "Received a watch result for a non existing watch.\n"
+#: src/service/fs/fs_download.c:1890
+msgid "Invalid URI"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/fs/fs_list_indexed.c:191
 #, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
+msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
-#, fuzzy, c-format
-msgid "Unable to create indices: %s.\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/pt/gnunet-daemon-pt.c:416
-msgid "Failed to pack DNS request.  Dropping.\n"
+#: src/service/fs/fs_misc.c:129
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:422
-msgid "# DNS requests mapped to VPN"
+#: src/service/fs/fs_namespace.c:203
+#, c-format
+msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:476
-msgid "# DNS records modified"
+#: src/service/fs/fs_namespace.c:234
+#, c-format
+msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:671
-msgid "# DNS replies intercepted"
+#: src/service/fs/fs_namespace.c:331
+#, c-format
+msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:678
-msgid "Failed to parse DNS request.  Dropping.\n"
+#: src/service/fs/fs_namespace.c:458
+msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:716
-msgid "# DNS requests dropped (timeout)"
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
+#, c-format
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:771
-msgid "# DNS requests intercepted"
-msgstr ""
+#: src/service/fs/fs_publish.c:732
+#, fuzzy, c-format
+msgid "Can not index file `%s': %s.\n"
+msgstr "Connessione stabilita con `%s'\n"
 
-#: src/pt/gnunet-daemon-pt.c:777
-msgid "# DNS requests dropped (DNS cadet channel down)"
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:786
-msgid "# DNS requests dropped (malformed)"
+#: src/service/fs/fs_publish.c:791
+#, fuzzy
+msgid "error on index-start request to `fs' service"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/service/fs/fs_publish.c:837
+msgid "failed to compute hash"
+msgstr "impossibile calcolare l'hash"
+
+#: src/service/fs/fs_publish.c:857
+msgid "filename too long"
+msgstr "nome file troppo lungo"
+
+#: src/service/fs/fs_publish.c:889
+msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:881
-msgid "# DNS replies received"
+#: src/service/fs/fs_publish.c:915
+#, c-format
+msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898
-msgid "# DNS replies dropped (too late?)"
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/fs/fs_publish.c:1108
 #, c-format
-msgid "Failed to connect to %s service.  Exiting.\n"
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1314
-msgid "Daemon to run to perform IP protocol translation to GNUnet"
+#: src/service/fs/fs_publish.c:1116
+#, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
+#: src/service/fs/fs_publish.c:1157
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
+#: src/service/fs/fs_publish.c:1397
+#, c-format
+msgid "Datastore failure: %s"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
+#: src/service/fs/fs_publish.c:1489
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
+#: src/service/fs/fs_publish_ksk.c:213
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
+#: src/service/fs/fs_publish_ublock.c:215
+msgid "Internal error."
+msgstr "Errore interno."
 
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
+#, c-format
+msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
+#: src/service/fs/fs_search.c:994
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
+#: src/service/fs/fs_unindex.c:64
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
+#: src/service/fs/fs_unindex.c:69
+msgid "Failed to read file"
+msgstr "Impossibile leggere il file"
+
+#: src/service/fs/fs_unindex.c:276
+msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
+#: src/service/fs/fs_unindex.c:327
+msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:805
-#, c-format
-msgid "Ego is required\n"
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
+msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:812
+#: src/service/fs/fs_unindex.c:386
 #, c-format
-msgid "Attribute value missing!\n"
+msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:819
+#: src/service/fs/fs_unindex.c:447
 #, c-format
-msgid "Requesting party key is required!\n"
+msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
+msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
+#: src/service/fs/fs_unindex.c:670
+msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
+#: src/service/fs/fs_unindex.c:709
+msgid "Failed to compute hash of file."
+msgstr "Impossibile calcolare l'hash del file."
 
-#: src/reclaim/gnunet-reclaim.c:852
-msgid "The EGO to use"
+#: src/service/fs/fs_uri.c:232
+#, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
+#: src/service/fs/fs_uri.c:291
+msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
+#: src/service/fs/fs_uri.c:309
+msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
+#: src/service/fs/fs_uri.c:316
+msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
+#: src/service/fs/fs_uri.c:383
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
+#: src/service/fs/fs_uri.c:424
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
+#: src/service/fs/fs_uri.c:441
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
+#: src/service/fs/fs_uri.c:518
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
+#: src/service/fs/fs_uri.c:535
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
+#: src/service/fs/fs_uri.c:545
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
+#: src/service/fs/fs_uri.c:553
+msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
+#: src/service/fs/fs_uri.c:562
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
+#: src/service/fs/fs_uri.c:568
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
+#: src/service/fs/fs_uri.c:575
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-msgid "OpenID Connect REST API initialized\n"
+#: src/service/fs/fs_uri.c:586
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-msgid "Identity Provider REST API initialized\n"
+#: src/service/fs/fs_uri.c:593
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:544
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Impossibile avviare il servizio.\n"
-
-#: src/regex/gnunet-daemon-regexprofiler.c:268
-#, c-format
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+#: src/service/fs/fs_uri.c:599
+msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
-msgid "Daemon to announce regular expressions for the peer using cadet."
+#: src/service/fs/fs_uri.c:613
+msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1365
-msgid "No configuration file given. Exiting\n"
-msgstr ""
+#: src/service/fs/fs_uri.c:646
+msgid "invalid argument"
+msgstr "argomento non valido"
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
-#, c-format
-msgid "No policy directory specified on command line. Exiting.\n"
+#: src/service/fs/fs_uri.c:666
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1421
-#, c-format
-msgid "No files found in `%s'\n"
+#: src/service/fs/fs_uri.c:1094
+msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1430
-msgid "No search strings file given. Exiting.\n"
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
+msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1450
-msgid "Error loading search strings. Exiting.\n"
+#: src/service/fs/gnunet-fs-profiler.c:211
+msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1539
-msgid "name of the file for writing statistics"
+#: src/service/fs/gnunet-fs-profiler.c:218
+msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1546
-msgid "wait TIMEOUT before ending the experiment"
+#: src/service/fs/gnunet-fs-profiler.c:225
+msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1552
-msgid "directory with policy files"
+#: src/service/fs/gnunet-fs-profiler.c:237
+msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
-msgid "name of file with input strings"
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
+msgid "# client searches active"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1566
-msgid "name of file with hosts' names"
+#: src/service/fs/gnunet-service-fs.c:423
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1581
-msgid "Profiler for regex"
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
-msgid "name of the table to write DFAs"
+#: src/service/fs/gnunet-service-fs.c:785
+msgid "# client searches received"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
-msgid "maximum path compression length"
+#: src/service/fs/gnunet-service-fs.c:825
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
-msgid "Profiler for regex library"
+#: src/service/fs/gnunet-service-fs.c:995
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:151
-#, c-format
-msgid "Regex `%s' is too long!\n"
+#: src/service/fs/gnunet-service-fs.c:1237
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/regex/regex_api_search.c:200
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, c-format
-msgid "Search string `%s' is too long!\n"
+msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:1369
-msgid "GNUnet REST server"
-msgstr ""
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
+#, fuzzy
+msgid "# replies received via cadet"
+msgstr "# byte ricevuti via SMTP"
 
-#: src/rest/plugin_rest_config.c:428
-msgid "CONFIG REST API initialized\n"
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
+#, fuzzy
+msgid "# replies received via cadet dropped"
+msgstr "# ACK ricevuti"
+
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/rest/plugin_rest_copying.c:211
-msgid "COPYING REST API initialized\n"
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
+msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:114
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
-msgid "Shutting down...\n"
-msgstr "Avvio di %s in corso...\n"
+msgid "# queries received via cadet"
+msgstr "# byte ricevuti via SMTP"
 
-#: src/revocation/gnunet-revocation.c:146
-#, c-format
-msgid "Key `%s' is valid\n"
-msgstr ""
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "# connessioni attive"
 
-#: src/revocation/gnunet-revocation.c:150
-#, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr ""
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# connessioni attive"
 
-#: src/revocation/gnunet-revocation.c:154
-msgid "Internal error\n"
-msgstr "Errore interno\n"
+#: src/service/fs/gnunet-service-fs_cp.c:539
+msgid "# migration stop messages received"
+msgstr ""
 
-#: src/revocation/gnunet-revocation.c:180
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
-msgid "Revocation failed (!)\n"
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
+#: src/service/fs/gnunet-service-fs_cp.c:671
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
+#: src/service/fs/gnunet-service-fs_cp.c:868
+msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
+#: src/service/fs/gnunet-service-fs_cp.c:893
+msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
+#: src/service/fs/gnunet-service-fs_cp.c:903
+msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1000
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:334
-#, c-format
-msgid "Ego `%s' not found.\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1058
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:350
-#, c-format
-msgid "Error: Key is invalid\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1082
+msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1096
+msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1153
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1197
+msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
+#: src/service/fs/gnunet-service-fs_cp.c:1541
+msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:424
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, c-format
-msgid "Public key `%s' malformed\n"
+msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
+#: src/service/fs/gnunet-service-fs_indexing.c:146
+#, c-format
+msgid "Error writing `%s'.\n"
+msgstr "Errore durante la scrittura di `%s'.\n"
+
+#: src/service/fs/gnunet-service-fs_indexing.c:243
+#, c-format
+msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:464
-msgid "No filename to store revocation certificate given.\n"
+#: src/service/fs/gnunet-service-fs_indexing.c:296
+msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:481
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "Generazione statistiche fallita\n"
-
-#: src/revocation/gnunet-revocation.c:511
-msgid "No action specified. Nothing to do.\n"
+#: src/service/fs/gnunet-service-fs_indexing.c:314
+msgid "not indexed"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
+#: src/service/fs/gnunet-service-fs_indexing.c:328
+#, c-format
+msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:538
+#: src/service/fs/gnunet-service-fs_indexing.c:434
+#, c-format
 msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
+#: src/service/fs/gnunet-service-fs_pe.c:260
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
+#: src/service/fs/gnunet-service-fs_pe.c:422
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:558
-msgid "number of epochs to calculate for"
+#: src/service/fs/gnunet-service-fs_pe.c:433
+msgid "# query plans executed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:539
-msgid "# unsupported revocations received via set union"
+#: src/service/fs/gnunet-service-fs_pe.c:462
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:549
-#, fuzzy
-msgid "# revocation messages received via set union"
-msgstr "# messaggi PONG ricevuti"
-
-#: src/revocation/gnunet-service-revocation.c:554
-#, c-format
-msgid "Error computing revocation set union with %s\n"
+#: src/service/fs/gnunet-service-fs_pe.c:530
+msgid "# requests merged"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
-msgid "# revocation set unions failed"
+#: src/service/fs/gnunet-service-fs_pe.c:540
+msgid "# requests refreshed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:566
-msgid "# revocation set unions completed"
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
+msgid "# query plan entries"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:604
-msgid "SET service crashed, terminating revocation service\n"
+#: src/service/fs/gnunet-service-fs_pr.c:305
+msgid "# Pending requests created"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
-msgid "Could not open revocation database file!"
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
+msgid "# Pending requests active"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
+#: src/service/fs/gnunet-service-fs_pr.c:795
+msgid "# replies received and matched"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3148
-msgid "timeout for the profiling"
+#: src/service/fs/gnunet-service-fs_pr.c:869
+msgid "# results found locally"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3153
-msgid "number of PeerIDs to request"
+#: src/service/fs/gnunet-service-fs_pr.c:1003
+msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:3170
-msgid "Measure quality and performance of the RPS service."
+#: src/service/fs/gnunet-service-fs_pr.c:1032
+msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
+#: src/service/fs/gnunet-service-fs_pr.c:1073
+msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
+#: src/service/fs/gnunet-service-fs_pr.c:1228
+msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
+#: src/service/fs/gnunet-service-fs_pr.c:1283
+#, c-format
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-msgid "You must specify at least one message ID to check!\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1304
+#, c-format
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1371
+msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1433
+msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1488
+msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, c-format
-msgid "Malformed input, could not parse `%s'\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1503
+msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, c-format
-msgid "Could not convert `%s' to int64_t.\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1526
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1543
+msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
+#: src/service/fs/gnunet-service-fs_pr.c:1564
+msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
+#: src/service/fs/gnunet-service-fs_pr.c:1570
+msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
+#: src/service/fs/gnunet-service-fs_pr.c:1616
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
+#: src/service/fs/gnunet-service-fs_pr.c:1629
+msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-msgid "Connect to CADET failed\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1680
+msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
+#: src/service/fs/gnunet-service-fs_pr.c:1744
+msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-msgid "number of peers in consensus"
+#: src/service/fs/gnunet-service-fs_push.c:643
+msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
+msgid "metadata length"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
+#: src/service/fs/meta_data.c:1073
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
+#: src/service/fs/meta_data.c:1092
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/service/fs/meta_data.c:1124
+#, c-format
+msgid "Serialized %ld bytes of metadata"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
+#: src/service/fs/meta_data.c:1131
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/service/gns/gns_tld_api.c:292
+msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
+#: src/service/gns/gnunet-bcd.c:573
+#, fuzzy, c-format
+msgid "Invalid port number %u\n"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "Impossibile avviare il servizio.\n"
+msgid "Unable to set up the daemon\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-msgid "number of element in set A-B"
-msgstr ""
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
+msgid "Failed to start HTTP server\n"
+msgstr "Impossibile avviare il server HTTP\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-msgid "number of element in set B-A"
+#: src/service/gns/gnunet-bcd.c:660
+msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
+#: src/service/gns/gnunet-bcd.c:669
+msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
+#: src/service/gns/gnunet-dns2gns.c:296
+msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr ""
+#: src/service/gns/gnunet-dns2gns.c:377
+#, fuzzy
+msgid "Failed to parse DNS response!\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-msgid "number of values"
+#: src/service/gns/gnunet-dns2gns.c:451
+#, c-format
+msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
+#: src/service/gns/gnunet-dns2gns.c:654
+#, c-format
+msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
+#: src/service/gns/gnunet-dns2gns.c:670
+#, c-format
+msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
+#: src/service/gns/gnunet-dns2gns.c:678
+#, c-format
+msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
+#: src/service/gns/gnunet-dns2gns.c:839
+msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
+#: src/service/gns/gnunet-dns2gns.c:999
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-msgid "write statistics to file"
+#: src/service/gns/gnunet-dns2gns.c:1016
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/seti/gnunet-seti-profiler.c:457
-msgid "return intersection instead of delta"
+#: src/service/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
+#: src/service/gns/gnunet-gns-benchmark.c:588
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
+#: src/service/gns/gnunet-gns-benchmark.c:593
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+#: src/service/gns/gnunet-gns-import.c:490
+msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-msgid "Failed to obtain statistics.\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
+#: src/service/gns/gnunet-gns-proxy.c:1004
+#, c-format
+msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
+#: src/service/gns/gnunet-gns-proxy.c:1025
+#, c-format
+msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:577
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, c-format
-msgid "No subsystem or name given\n"
+msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:589
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, c-format
-msgid "Failed to initialize watch routine\n"
+msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:725
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
-msgid "Invalid argument `%s'\n"
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:742
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, c-format
-msgid "A port is required to connect to host `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:751
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:783
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
+#: src/service/gns/gnunet-gns-proxy.c:2654
+#, c-format
+msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr ""
+#: src/service/gns/gnunet-gns-proxy.c:2686
+#, fuzzy, c-format
+msgid "Unable to import certificate from `%s'\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
+#: src/service/gns/gnunet-gns-proxy.c:2895
+#, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
+msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
+#: src/service/gns/gnunet-gns-proxy.c:3268
+#, c-format
+msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
+#: src/service/gns/gnunet-gns-proxy.c:3300
+#, c-format
+msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
+#: src/service/gns/gnunet-gns-proxy.c:3386
+#, c-format
+msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
+#: src/service/gns/gnunet-gns-proxy.c:3726
+#, c-format
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
+#: src/service/gns/gnunet-gns-proxy.c:3868
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
+#: src/service/gns/gnunet-gns-proxy.c:3873
+msgid "pem file to use as CA"
 msgstr ""
 
-#: src/statistics/statistics_api.c:749
-msgid "Could not save some persistent statistics\n"
+#: src/service/gns/gnunet-gns-proxy.c:3877
+msgid "disable use of IPv6"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:185
-#, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
+#: src/service/gns/gnunet-gns-proxy.c:3903
+msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr ""
+#: src/service/gns/gnunet-service-gns.c:518
+#, fuzzy
+msgid "Properly base32-encoded public key required"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/testing/gnunet-testing.c:386
-msgid "create unique configuration files"
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
+msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
+msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
+msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:407
-msgid "configuration template"
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
+msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
+#: src/service/gns/gnunet-service-gns_resolver.c:669
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
-msgid "Command line tool to access the testing library"
+#: src/service/gns/gnunet-service-gns_resolver.c:681
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, c-format
-msgid "Incorrect hostkey file format: %s\n"
+msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/testing/list-keys.c:92
-msgid "list COUNT number of keys"
+#: src/service/gns/gnunet-service-gns_resolver.c:900
+msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/testing/testing.c:291
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
-msgid "Hostkeys file not found: %s\n"
+msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/testing/testing.c:743
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
-msgid "Key number %u does not exist\n"
+msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/testing/testing.c:1217
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/testing/testing.c:1226
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
+msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
+msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
+msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/testing/testing.c:1265
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
+msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1279
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1307
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:257
-msgid "# connect requests issued to ATS"
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:451
-msgid "# HELLO messages gossipped"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:805
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:870
-msgid "# HELLO messages received"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
+#, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
-msgid "GNUnet topology control"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1787
-msgid "GNUnet QUIC communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
-msgid "GNUnet TCP communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
-msgid "GNUnet UDP communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
+#, c-format
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
-msgid ""
-"Maximum number of UNIX connections exceeded, dropping incoming message\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1015
-msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
+#, c-format
+msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, c-format
-msgid "Cannot create path to `%s'\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1138
-msgid "GNUnet UNIX domain socket communicator"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %s)\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:454
-#, c-format
-msgid "Failed to connect to `%s'\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
-msgid "Failed to resolve address for peer `%s'\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:477
-#, fuzzy
-msgid "Failed to list connections, timeout occurred\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
+msgid "# active connections"
 msgstr "# connessioni attive"
 
-#: src/transport/gnunet-transport.c:504
-#, fuzzy, c-format
-msgid "Transmitting %u bytes\n"
-msgstr "Avvio del servizio '%s' in corso\n"
-
-#: src/transport/gnunet-transport.c:537
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, c-format
-msgid ""
-"Successfully connected to `%s', starting to send benchmark data in %u Kb "
-"blocks\n"
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, c-format
-msgid "Disconnected from peer `%s' while benchmarking\n"
+msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:592
-msgid "Connected to"
-msgstr "Connesso a"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:621
-msgid "Disconnected from"
-msgstr "Disconnesso da"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
+msgid "# hostlist URIs read from file"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, c-format
-msgid "Received %u bytes\n"
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, c-format
-msgid "Peer `%s': %s %s in state `%s' until %s\n"
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
-msgid "Peer `%s': %s %s\n"
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1103
-#, fuzzy
-msgid "Monitor disconnected from transport service. Reconnecting.\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
+msgid "# hostlist URIs written to file"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
-msgid ""
-"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s %s\n"
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
+msgid "Learning is not enabled on this peer\n"
+msgstr ""
+
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1242
-#, fuzzy
-msgid "Failed to connect to transport service for disconnection\n"
-msgstr "Impossibile avviare il servizio.\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
+msgid "bytes in hostlist"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:1248
-msgid "Blacklisting request in place, stop with CTRL-C\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
-msgid "Failed to connect to transport service\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1301
-msgid "Starting to receive benchmark data\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1367
-msgid "print information for all peers (instead of only connected peers)"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1373
-msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
-#, fuzzy
-msgid "disconnect from a peer"
-msgstr "# amici connessi"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
+msgid "Could not handle hostlist request since I do not have a response yet\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:1383
-msgid "provide information about all current connections (once)"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1395
-msgid ""
-"provide information about all connects and disconnect events (continuously)"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1399
-msgid "do not resolve hostnames"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1404
-msgid "peer identity"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1408
-msgid "monitor plugin sessions"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
+msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
-msgid "Direct access to transport service."
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/transport/transport_api2_communication.c:761
-msgid "Dropped backchanel message: handler not provided by communicator\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Errore di lettura da '%s': %s\n"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr "Fine del file"
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/util/bio.c:270
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Errore di lettura del file `%s'\n"
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/util/bio.c:312
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, c-format
-msgid "Invalid handle type while reading `%s'"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
+#, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:345
-#, fuzzy, c-format
-msgid "%s (while reading `%s')"
-msgstr "Errore di lettura del file `%s'\n"
+#: src/service/identity/gnunet-service-identity.c:921
+#, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr ""
 
-#: src/util/bio.c:350
+#: src/service/identity/gnunet-service-identity.c:979
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:363
+#: src/service/identity/gnunet-service-identity.c:988
 #, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
+msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/util/bio.c:687 src/util/bio.c:708
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Errore di lettura del file `%s'\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
+msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/bio.c:773
-#, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr ""
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
+#, fuzzy, c-format
+msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
+#: src/service/namecache/namecache_api.c:283
+msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/service/namecache/namecache_api.c:371
+msgid "Error communicating with namecache service"
 msgstr ""
 
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
+msgid "can not search the namestore"
 msgstr ""
 
-#: src/util/common_logging.c:910
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
+msgid "unable to scan namestore"
 msgstr ""
 
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "ERRORE"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
+#, fuzzy, c-format
+msgid "Failed to create record for `%s': %s\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "ATTENZIONE"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
+#, fuzzy
+msgid "no errors"
+msgstr "errore sconosciuto"
 
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
+#, c-format
+msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "DEBUG"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
+msgid "key exists"
+msgstr ""
 
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr "NESSUNA"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy
+msgid "Error creating record data\n"
+msgstr "Errore interno."
 
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr "NON VALIDO"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
+#, fuzzy
+msgid "unable to store record"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr "indirizzo sconosciuto"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
+#, c-format
+msgid "Requested name `%s' exists with `%u' records\n"
+msgstr ""
 
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr "indirizzo non valido"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
+msgid "name exists\n"
+msgstr ""
 
-#: src/util/common_logging.c:1416
-#, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
+msgid "unable to process submitted data"
 msgstr ""
 
-#: src/util/common_logging.c:1431
-#, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
+msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/util/configuration.c:1073
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
+#, fuzzy
+msgid "invalid parameters"
+msgstr "argomento non valido"
+
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
+#, fuzzy
+msgid "invalid name"
+msgstr "argomento non valido"
+
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
+msgid "Unable to parse key %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/configuration.c:1718
-msgid "Not a valid relative time specification"
-msgstr ""
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
+#, fuzzy
+msgid "unable to parse key"
+msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
+msgid "No expiration specified for records.\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:148
-#, c-format
-msgid "%s, %s or %s argument is required\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
+msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
+msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/util/configuration_helper.c:263
-#, c-format
-msgid "failed to load configuration defaults"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
+msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
+msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/util/crypto_ecc.c:554
-#, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:677
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:282
-msgid "Could not load peer's private key\n"
-msgstr ""
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Impossibile avviare il server HTTP\n"
 
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:908
-#, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
+msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1208
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/util/disk.c:843
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/util/disk.c:1222 src/util/service.c:1642
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/util/dnsparser.c:910
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/util/dnsstub.c:228
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
-msgid "Could not bind to any port: %s\n"
+msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/util/dnsstub.c:371
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
+msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Generazione statistiche fallita\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
+msgid "upnpc not found\n"
+msgstr "upnpc non trovato\n"
 
-#: src/util/dnsstub.c:509
-#, c-format
-msgid "Sent DNS request to %s\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: src/service/nat-auto/nat_auto_api.c:73
+msgid "Operation Successful"
 msgstr ""
 
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: src/service/nat-auto/nat_auto_api.c:76
+msgid "IPC failure"
 msgstr ""
 
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: src/service/nat-auto/nat_auto_api.c:79
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
+#: src/service/nat-auto/nat_auto_api.c:82
+msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: src/service/nat-auto/nat_auto_api.c:85
+msgid "detected that we are offline"
 msgstr ""
 
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: src/service/nat-auto/nat_auto_api.c:88
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: src/service/nat-auto/nat_auto_api.c:91
+msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
+#: src/service/nat-auto/nat_auto_api.c:94
+msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/util/getopt.c:971
-#, c-format
-msgid "Use %s to get a list of options.\n"
+#: src/service/nat-auto/nat_auto_api.c:97
+msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/util/getopt.c:984
-#, c-format
-msgid "Option `%s' can't be used with other options.\n"
+#: src/service/nat-auto/nat_auto_api.c:100
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/util/getopt.c:996
-#, c-format
-msgid "Missing mandatory option `%s'.\n"
+#: src/service/nat-auto/nat_auto_api.c:103
+msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
+#: src/service/nat-auto/nat_auto_api.c:106
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+#: src/service/nat-auto/nat_auto_api.c:109
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
+#: src/service/nat-auto/nat_auto_api.c:113
+msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
+#: src/service/nat-auto/nat_auto_api.c:116
+msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
+#: src/service/nat-auto/nat_auto_api.c:119
+msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
+#: src/service/nat-auto/nat_auto_api.c:122
+msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/util/getopt_helpers.c:463
-msgid "use configuration file FILENAME"
+#: src/service/nat-auto/nat_auto_api.c:125
+msgid "could not register NAT"
 msgstr ""
 
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
+#: src/service/nat-auto/nat_auto_api.c:128
+msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/util/getopt_helpers.c:571
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgid "Failed to find valid PORT in section `%s'\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
+#: src/service/nat-auto/nat_auto_api_test.c:489
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
+#: src/service/nat/gnunet-service-nat.c:1351
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
+#: src/service/nat/gnunet-service-nat.c:1362
+#, c-format
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:632
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
-msgid "You must pass relative time to the `%s' option.\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:686
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:743
-#, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
+#: src/service/nat/gnunet-service-nat.c:1861
+msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
+#: src/service/nat/gnunet-service-nat.c:1935
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:806
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:876
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
+msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+#: src/service/nat/gnunet-service-nat_mini.c:188
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
+#: src/service/nat/gnunet-service-nat_mini.c:602
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
+#: src/service/nse/gnunet-nse-profiler.c:857
+msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
+#: src/service/nse/gnunet-nse-profiler.c:864
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
+#: src/service/nse/gnunet-nse-profiler.c:879
+msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
+#: src/service/nse/gnunet-nse-profiler.c:888
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
+#: src/service/nse/gnunet-nse-profiler.c:900
+msgid "delay between rounds"
 msgstr ""
 
-#: src/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
+#: src/service/nse/gnunet-nse-profiler.c:912
+msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
+#: src/service/peerstore/gnunet-peerstore.c:92
+msgid "peerstore"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:95
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, c-format
-msgid "Failed to open `%s': %s\n"
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:129
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, c-format
-msgid "Generating %u keys like %s, please wait"
+msgid "Could not load database backend `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:137
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
-msgid "Generating %u keys, please wait"
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:178
-#, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
+#: src/service/peerstore/gnunet-service-peerstore.c:692
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:185
-#, c-format
-msgid ""
-"\n"
-"Finished!\n"
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
+msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
-"\n"
-"Completato!\n"
 
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
+#: src/service/peerstore/peerstore_api.c:781
+msgid "Received a malformed response from service."
 msgstr ""
 
-#: src/util/gnunet-ecc.c:304
-#, c-format
-msgid "Hostkeys file `%s' not found\n"
+#: src/service/peerstore/peerstore_api.c:895
+msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:314
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, c-format
-msgid "Hostkeys file `%s' is empty\n"
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:334
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, c-format
-msgid "Could not read hostkey file: %s\n"
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr ""
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "Generazione statistiche fallita\n"
 
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
+#: src/service/pt/gnunet-daemon-pt.c:416
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
+#: src/service/pt/gnunet-daemon-pt.c:422
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
+#: src/service/pt/gnunet-daemon-pt.c:476
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
+#: src/service/pt/gnunet-daemon-pt.c:671
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
+#: src/service/pt/gnunet-daemon-pt.c:678
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
-msgid "print the public key in HEX format"
+#: src/service/pt/gnunet-daemon-pt.c:716
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
+#: src/service/pt/gnunet-daemon-pt.c:771
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:499
-msgid "Manipulate GNUnet private ECC key files"
+#: src/service/pt/gnunet-daemon-pt.c:777
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Impossibile leggere il file"
+#: src/service/pt/gnunet-daemon-pt.c:786
+msgid "# DNS requests dropped (malformed)"
+msgstr ""
 
-#: src/util/gnunet-qr.c:134
-#, c-format
-msgid "Added URI %s\n"
+#: src/service/pt/gnunet-daemon-pt.c:881
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/util/gnunet-qr.c:161
-#, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
+#: src/service/pt/gnunet-daemon-pt.c:898
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/util/gnunet-qr.c:171
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
+msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:182
-#, c-format
-msgid "No known handler for subsystem `%s'\n"
+#: src/service/pt/gnunet-daemon-pt.c:1314
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/reclaim/reclaim_api.c:544
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Impossibile avviare il servizio.\n"
 
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
+#, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr ""
 
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "Avvio di %s in corso...\n"
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
+msgid "Daemon to announce regular expressions for the peer using cadet."
+msgstr ""
 
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
+#: src/service/regex/gnunet-regex-profiler.c:1365
+msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
-msgid "Got %d images\n"
+msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
-msgid "Found %s: \"%s\"\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
-
-#: src/util/gnunet-qr.c:546
-#, fuzzy
-msgid "No data found\n"
-msgstr "upnpc non trovato\n"
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
+#: src/service/regex/gnunet-regex-profiler.c:1421
+#, c-format
+msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
+#: src/service/regex/gnunet-regex-profiler.c:1430
+msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
+#: src/service/regex/gnunet-regex-profiler.c:1450
+msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
+#: src/service/regex/gnunet-regex-profiler.c:1539
+msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
+#: src/service/regex/gnunet-regex-profiler.c:1546
+msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:183
-msgid "Use built-in GNUnet stub resolver"
+#: src/service/regex/gnunet-regex-profiler.c:1552
+msgid "directory with policy files"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:215
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/service/regex/gnunet-regex-profiler.c:1559
+msgid "name of file with input strings"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
+#: src/service/regex/gnunet-regex-profiler.c:1566
+msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
+#: src/service/regex/gnunet-regex-profiler.c:1581
+msgid "Profiler for regex"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
+msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
+msgid "maximum path compression length"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:313
-msgid "Manipulate GNUnet proof of work files"
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
+msgid "Profiler for regex library"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:1288
-msgid "No DNS server available. DNS resolution will not be possible.\n"
+#: src/service/regex/regex_api_announce.c:151
+#, c-format
+msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
+#: src/service/regex/regex_api_search.c:200
 #, c-format
-msgid "No URI specified on command line\n"
+msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
+#: src/service/rest/gnunet-rest-server.c:1369
+msgid "GNUnet REST server"
 msgstr ""
 
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
+#: src/service/revocation/gnunet-service-revocation.c:539
+msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/util/gnunet-uri.c:109
+#: src/service/revocation/gnunet-service-revocation.c:549
+#, fuzzy
+msgid "# revocation messages received via set union"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
-msgid "No handler known for subsystem `%s'\n"
+msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
+#: src/service/revocation/gnunet-service-revocation.c:558
+msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/util/helper.c:304
-#, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "Errore di lettura da '%s': %s\n"
+#: src/service/revocation/gnunet-service-revocation.c:566
+msgid "# revocation set unions completed"
+msgstr ""
 
-#: src/util/helper.c:356
-#, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
+#: src/service/revocation/gnunet-service-revocation.c:604
+msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/util/helper.c:571
-#, c-format
-msgid "Error writing to `%s': %s\n"
+#: src/service/revocation/gnunet-service-revocation.c:959
+msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+#: src/service/seti/gnunet-seti-profiler.c:457
+msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/util/network.c:1284
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/util/os_installation.c:416
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/util/os_installation.c:787
-#, c-format
-msgid "Could not find binary `%s' in PATH!\n"
+#: src/service/statistics/statistics_api.c:749
+msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/util/os_installation.c:820
+#: src/service/testing/gnunet-testing.c:185
 #, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/util/plugin.c:158
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+#: src/service/testing/gnunet-testing.c:386
+msgid "create unique configuration files"
 msgstr ""
 
-#: src/util/plugin.c:215
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+#: src/service/testing/gnunet-testing.c:392
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/util/plugin.c:371
-msgid "Could not determine plugin installation path.\n"
+#: src/service/testing/gnunet-testing.c:400
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr ""
 
-#: src/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/testing/gnunet-testing.c:407
+msgid "configuration template"
+msgstr ""
 
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/testing/gnunet-testing.c:415
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
+msgstr ""
 
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/testing/gnunet-testing.c:432
+msgid "Command line tool to access the testing library"
+msgstr ""
 
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
+#: src/service/testing/list-keys.c:92
+msgid "list COUNT number of keys"
+msgstr ""
 
-#: src/util/regex.c:123
+#: src/service/testing/testing.c:291
 #, c-format
-msgid "Bad mask: %d\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/service/testing/testing.c:743
 #, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/util/resolver_api.c:243
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:888
+#: src/service/testing/testing.c:1226
 #, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+#: src/service/testing/testing.c:1236
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1086
-msgid "Resolver not configured correctly.\n"
+#: src/service/testing/testing.c:1249
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
+#: src/service/testing/testing.c:1265
 #, c-format
-msgid "Could not resolve our FQDN: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:654
+#: src/service/testing/testing.c:1279
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
+msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/util/service.c:838
+#: src/service/testing/testing.c:1307
 #, c-format
-msgid "Unknown address family %d\n"
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/util/service.c:951
+#: src/service/testing/testing.c:1413
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:992
+#: src/service/testing/testing.c:1664
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/service/testing/testing.c:2795
 #, c-format
-msgid "`%s' failed for port %d (%s).\n"
+msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/util/service.c:1413
+#: src/service/testing/testing.c:2803
 #, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/util/service.c:1420
+#: src/service/testing/testing.c:2811
 #, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+#: src/service/topology/gnunet-daemon-topology.c:257
+msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/service/topology/gnunet-daemon-topology.c:451
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+#: src/service/topology/gnunet-daemon-topology.c:805
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/util/service.c:1644
-msgid "No such user"
+#: src/service/topology/gnunet-daemon-topology.c:870
+msgid "# HELLO messages received"
 msgstr ""
 
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+#: src/service/topology/gnunet-daemon-topology.c:1005
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
+#: src/service/transport/gnunet-communicator-quic.c:1787
+msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
+#: src/service/transport/gnunet-communicator-tcp.c:4071
+msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
+#: src/service/transport/gnunet-communicator-udp.c:3433
+msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/util/service.c:2099
-msgid "Malformed configuration, exit ...\n"
+#: src/service/transport/gnunet-communicator-unix.c:788
+msgid ""
+"Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+#: src/service/transport/gnunet-communicator-unix.c:1015
+msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/util/socks.c:653
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/service/transport/gnunet-communicator-unix.c:1138
+msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/service/transport/gnunet-transport.c:406
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
+#: src/service/transport/gnunet-transport.c:415
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
+#: src/service/transport/gnunet-transport.c:454
+#, c-format
+msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+#: src/service/transport/gnunet-transport.c:466
+#, c-format
+msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr ""
+#: src/service/transport/gnunet-transport.c:477
+#, fuzzy
+msgid "Failed to list connections, timeout occurred\n"
+msgstr "# connessioni attive"
 
-#: src/util/strings.c:1081
+#: src/service/transport/gnunet-transport.c:504
+#, fuzzy, c-format
+msgid "Transmitting %u bytes\n"
+msgstr "Avvio del servizio '%s' in corso\n"
+
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
+#: src/service/transport/gnunet-transport.c:566
+#, c-format
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/util/strings.c:1283
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
-msgid "Malformed port policy `%s'\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
+#: src/service/transport/gnunet-transport.c:592
+msgid "Connected to"
+msgstr "Connesso a"
+
+#: src/service/transport/gnunet-transport.c:621
+msgid "Disconnected from"
+msgstr "Disconnesso da"
+
+#: src/service/transport/gnunet-transport.c:654
 #, c-format
-msgid "Invalid format for IP: `%s'\n"
+msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/util/strings.c:1408
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/util/strings.c:1459
+#: src/service/transport/gnunet-transport.c:701
 #, c-format
-msgid "Invalid format: `%s'\n"
+msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/util/strings.c:1501
+#: src/service/transport/gnunet-transport.c:1103
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/service/transport/gnunet-transport.c:1199
 #, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s %s\n"
 msgstr ""
 
-#: src/util/strings.c:1551
+#: src/service/transport/gnunet-transport.c:1214
 #, c-format
-msgid "Wrong format `%s' for netmask\n"
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/util/strings.c:1582
-#, c-format
-msgid "Wrong format `%s' for network\n"
+#: src/service/transport/gnunet-transport.c:1242
+#, fuzzy
+msgid "Failed to connect to transport service for disconnection\n"
+msgstr "Impossibile avviare il servizio.\n"
+
+#: src/service/transport/gnunet-transport.c:1248
+msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/util/time.c:901 src/util/time.c:929
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
+msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/util/time.c:937
-#, c-format
+#: src/service/transport/gnunet-transport.c:1301
+msgid "Starting to receive benchmark data\n"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1367
+msgid "print information for all peers (instead of only connected peers)"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1373
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1377
+#, fuzzy
+msgid "disconnect from a peer"
+msgstr "# amici connessi"
+
+#: src/service/transport/gnunet-transport.c:1383
+msgid "provide information about all current connections (once)"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1395
 msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+"provide information about all connects and disconnect events (continuously)"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1399
+msgid "do not resolve hostnames"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1404
+msgid "peer identity"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1408
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1414
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/service/transport/gnunet-transport.c:1426
+msgid "Direct access to transport service."
+msgstr ""
+
+#: src/service/transport/transport_api2_communication.c:761
+msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/util/gnunet-service-resolver.c:1288
+msgid "No DNS server available. DNS resolution will not be possible.\n"
+msgstr ""
+
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# Canali attivi"
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# messaggi PONG decrittati"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr "# Destinazioni attive"
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:142
-msgid "Error creating tunnel\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:202
-#, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:216
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:239
-#, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:258
-#, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "`%s' non è un indirizzo IP valido.\n"
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:334
-msgid "service is offered via TCP"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:339
-msgid "service is offered via UDP"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr ""
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 51d0303ce..f805fc900 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -18,582 +18,2501 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "Его „%s“ није познат услузи идентитета\n"
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, fuzzy, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr "Јавни кључ „%s“ није добро оформљен\n"
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Нисам успео да се повежем са смештајем назива\n"
-
-#: src/abd/gnunet-abd.c:566
-#, fuzzy
-msgid "Ego does not exist!\n"
-msgstr "Број кључа %u не постоји\n"
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, fuzzy, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr "Јавни кључ „%s“ није добро оформљен\n"
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Нисам успео да се повежем са ГНС-ом\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, fuzzy, c-format
-msgid "ego required\n"
-msgstr "Потребна је исправна врста\n"
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, fuzzy, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr "Јавни кључ „%s“ није добро оформљен\n"
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, fuzzy, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr "Наведите назив за тражење!\n"
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-#, fuzzy
-msgid "The public key of the authority to verify the credential against"
-msgstr "Наводи јавни кључ зоне у којој ће се тражити запис"
-
-#: src/abd/gnunet-abd.c:1030
-msgid "The ego/zone name to use"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-#, fuzzy
-msgid "GNUnet abd resolver tool"
-msgstr "Алат ГНУнет ГНС решавача"
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Нисам успео да се повежем са ГНС-ом\n"
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Нисам успео да уклоним датотеку подешавања „%s“\n"
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Нисам успео да уклоним матични директоријум услуге „%s“\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr "Порука је успешно послата"
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 msgid "We disconnected from ARM before we could send a request"
 msgstr "Прекинута је веза са АУР-ом пре него ли можемо послати захтев"
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 msgid "Unknown request status"
 msgstr "Стање захтева је непознато"
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "„%s“ је заустављен"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is starting"
 msgstr "„%s“ се покреће"
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "„%s“ се зауставља"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "is starting already"
 msgstr "„%s“ се већ покреће"
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "„%s“ се већ зауставља"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 #, fuzzy
 msgid "is started already"
 msgstr "„%s“ је већ покренут"
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "„%s“ је већ заустављен"
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "„%s“ услуга није позната АУР-у"
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "„%s“ услуга није успела да се покрене"
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 #, fuzzy
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "„%s“ услуга се не може покренути јер се АУР гаси"
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "%.s Непознат код резултата."
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Кобна грешка покретања АУР АПИ-ја.\n"
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Нисам успео да покренем АУР услугу: %s\n"
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Нисам успео да пошаљем захтев за заустављање АУР услузи: %s\n"
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Нисам успео да зауставим АУР услугу: %s\n"
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Нисам успео да пошаљем захтев за покретање „%s“ услузи: %%s\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Нисам успео да покренем „%s“ услугу: %s\n"
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Нисам успео да пошаљем захтев за убијање „%s“ услуге: %%s\n"
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Нисам успео да убијем „%s“ услугу: %s\n"
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Нисам успео да захтевам списак услуга: %s\n"
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Грешка у комуникацији са АУР-ом. Да ли је АУР покренут?\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Покренуте услуге:\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "Кључна услуга „%4s“ је спремна.\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr "Сада пратим само, притисните КТРЛ-Ц да зауставите.\n"
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Заустављен%s.\n"
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, c-format
 msgid "Starting %s...\n"
 msgstr "Покрећем %s...\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Заустављам %s...\n"
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Непознато стање %u за услугу „%s“.\n"
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr "зауставља све ГНУнет услуге"
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr "покреће нарочиту услугу"
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr "зауставља нарочиту услугу"
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr "покреће све основне ГНУнет услуге"
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr "зауставља и покреће све основне ГНУнет услуге"
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr "брише датотеку подешавања и директоријум на изласку"
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr "прати активности АУР-а"
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr "не исписује поруке стања"
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr "исписује тренутно покренуте услуге"
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr "не да да „gnunet-service-arm“ наследи стандардни излаз"
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr "не да да „gnunet-service-arm“ наследи стандардну грешку"
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr "Контролне услуге и Аутоматизовани Управник Рестарта (АУР)"
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
+#, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Неисправан ИБ парњака „%s“\n"
+
+#: src/cli/cadet/gnunet-cadet.c:685
+#, c-format
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:746
+#, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Неисправна мета „%s“\n"
+
+#: src/cli/cadet/gnunet-cadet.c:775
+msgid "No action requested\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:800
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "обезбеђује податке о нарочитој вези"
+
+#: src/cli/cadet/gnunet-cadet.c:804
+#, fuzzy
+msgid "Activate echo mode"
+msgstr "покреће режим ехоа"
+
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:817
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "обезбеђује податке о нарочитом тунелу"
+
+#: src/cli/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "обезбеђује податке о свим парњацима"
+
+#: src/cli/cadet/gnunet-cadet.c:827
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "обезбеђује податке о свим тунелима"
+
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr "# пријатељи су повезани"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:99
+#, fuzzy
+msgid "key received"
+msgstr "# Резултати су примљени"
+
+#: src/cli/core/gnunet-core.c:103
+#, fuzzy
+msgid "connection established"
+msgstr "Веза је успостављена.\n"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "Прекинута је веза са"
+
+#: src/cli/core/gnunet-core.c:120
+#, fuzzy
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+"Веза са услугом конверзације је изгубљена, покушавам поново да се повежем\n"
+
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "<непознато време>"
+
+#: src/cli/core/gnunet-core.c:129
+#, fuzzy, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr "%24s: %-17s %4s   (укупно повезивања: %u)\n"
+
+#: src/cli/core/gnunet-core.c:157
+#, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Неисправан аргумент линије наредби „%s“\n"
+
+#: src/cli/core/gnunet-core.c:163
+msgid "Failed to connect to CORE service!\n"
+msgstr "Нисам успео да се повежем са ЈЕЗГРЕНОМ услугом!\n"
+
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+msgid "provide information about all current connections (continuously)"
+msgstr "обезбеђује податке о свим тренутним везама (непрекидно)"
+
+#: src/cli/core/gnunet-core.c:196
+msgid "Print information about connected peers."
+msgstr "Исписује податке о повезаним парњацима."
+
+#: src/cli/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:257
+#, c-format
+msgid "Error queueing datastore GET operation\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
+
+#: src/cli/datastore/gnunet-datastore.c:319
+#, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Нисам успео да сместим ставку: %s, прекидам\n"
+
+#: src/cli/datastore/gnunet-datastore.c:331
+#, fuzzy, c-format
+msgid "Inserted %<PRIu64> records\n"
+msgstr "поставља A записе"
+
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:378
+#, c-format
+msgid "Error queueing datastore PUT operation\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "Нисам успео да се повежем са смештајем података."
+
+#: src/cli/datastore/gnunet-datastore.c:454
+#, fuzzy, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr "Изаберите једну радњу : „%s“ или „%s“ или „%s“ или „%s“ или „%s“\n"
+
+#: src/cli/datastore/gnunet-datastore.c:477
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr "Претражује запис за датим називом"
+
+#: src/cli/datastore/gnunet-datastore.c:482
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# бајтови су послати смештају података"
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:498
+msgid "Manipulate GNUnet datastore"
+msgstr "Манипулише ГНУнет смештајом података"
+
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
-"Искључујем ИПв6 подршку за услугу „%s“, нисм успео да направим ИПв6 "
-"прикључницу: %s\n"
+"Резултат %d, врста %d:\n"
+"%.*s\n"
+
+#: src/cli/dht/gnunet-dht-get.c:167
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+"Резултат %d, врста %d:\n"
+"%.*s\n"
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
+msgstr "Морате доставити кључ за ДХТ ДОБАВИ!\n"
+
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr "Захтева исправан број прикључника за услугу „%s“ у подешавањима!\n"
+msgid "Failed to connect to DHT service!\n"
+msgstr "Нисам успео да се повежем са „DHT“ услугом!\n"
+
+#: src/cli/dht/gnunet-dht-get.c:256
+#, fuzzy
+msgid "Issuing DHT GET with key"
+msgstr "Издајем ДХТ ДОБАВИ са кључем"
+
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
+msgstr "кључ упита"
+
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
+msgstr "колико паралелних захтева (реплика) да направи"
+
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+#, fuzzy
+msgid "use DHT's record route option"
+msgstr "користи опцију ДХТ-а демултиплексирај свуда"
+
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
+msgstr "врста података за тражење"
+
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
+msgstr "колико дуго да извршава овај упит пре одустајања?"
+
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
+msgstr "користи опцију ДХТ-а демултиплексирај свуда"
+
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr "Издаје ДОБАВИ захтев ГНУнет ДХТ-у, исписује резултате."
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
+msgstr "колико дуго треба да ради наредба праћења"
+
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
+msgstr "бива опширан (исписује податке напредовања)"
+
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
+msgstr "Исписује све пакете који иду кроз „DHT“."
+
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr "Морате доставити КЉУЧ и ПОДАЦИ за ДХТ стављање!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Не могу да се повежем са „%s“ услугом!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr "ЈУНИКС_ПУТАЊА „%s“ је предуга, највећа дужина је %llu\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr "Издајем захтев стављања за „%s“ са подацима „%s“!\n"
+
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
+msgstr "подаци за уметање под кључем"
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr "колико ће дуго да држи овај унос у дхт-у (у секундама)"
+
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
+msgstr "број реплика за стварање"
+
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
+msgstr "врста за уметање података"
+
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr "Издаје захтев СТАВИ у ГНУнет ДХТ уметак ПОДАТАКА под КЉУЧЕМ."
+
+#: src/cli/fs/gnunet-auto-share.c:234
 #, c-format
-msgid "Using `%s' instead\n"
-msgstr "Користим зато „%s“\n"
+msgid "Failed to load state: %s\n"
+msgstr "Нисам успео да учитам стање: %s\n"
+
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
+#, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Нисам успео да сачувам стање у датотеку „%s“\n"
+
+#: src/cli/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr "Објављивање „%s“ је готово\n"
+
+#: src/cli/fs/gnunet-auto-share.c:480
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr "Објављујем „%s“\n"
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
+#: src/cli/fs/gnunet-auto-share.c:491
+#, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Нисам успео да покренем „%s“\n"
+
+#: src/cli/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
-"Искључујем подршку прикључнице ЈУНИКС домена за услугу „%s“, нисм успео да "
-"направим прикључницу ЈУНИКС домена: %s\n"
+"Морате навести један и само један назив директоријума за самостално "
+"објављивање.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "поставља жељени НИВО анонимности пошиљаоца"
+
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr "искључује додавање времена стварања метаподацима утоварене датотеке"
+
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
+msgstr "не користи „libextractor“ за додавање кључних речи или метаподатака"
+
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr "наводи приоритет садржаја"
+
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
+msgstr "поставља жељени НИВО одоговарања"
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr "Самостално објављује датотеке из директоријума на ГНУнет-у"
+
+#: src/cli/fs/gnunet-directory.c:54
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr "\t<изворна датотека угнеждена у %u бајта метаподатака>\n"
+
+#: src/cli/fs/gnunet-directory.c:106
+#, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "Метаподаци директоријума „%s“:\n"
+
+#: src/cli/fs/gnunet-directory.c:109
+#, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "Садржај директоријума „%s“:\n"
+
+#: src/cli/fs/gnunet-directory.c:146
+msgid "You must specify a filename to inspect.\n"
+msgstr "Морате навести назив датотеке за преглед.\n"
+
+#: src/cli/fs/gnunet-directory.c:160
+#, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Нисам успео да прочитам директоријум „%s“\n"
+
+#: src/cli/fs/gnunet-directory.c:170
+#, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "„%s“ није ГНУнет директоријум\n"
+
+#: src/cli/fs/gnunet-directory.c:201
+msgid "Display contents of a GNUnet directory"
+msgstr "Приказује садржај ГНУнет директоријума"
+
+#: src/cli/fs/gnunet-download.c:131
+#, c-format
+msgid "Starting download `%s'.\n"
+msgstr "Покрећем преузимање „%s“.\n"
+
+#: src/cli/fs/gnunet-download.c:143
+msgid "<unknown time>"
+msgstr "<непознато време>"
+
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
-"Немам ни ПРИКЉУЧНИК ни ЈУНИКС_ПУТАЊУ за услугу „%s“, али је једно потребно\n"
+"Преузимам „%s“ при %llu/%llu (преостаје %s, %s/сек). Блоку је требало %s за "
+"преузимање\n"
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
+#: src/cli/fs/gnunet-download.c:177
 #, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "��и����м усп���� ���� ре��им „%s“: %s\n"
+msgid "Error downloading: %s.\n"
+msgstr "����еш��а пре������мања: %s.\n"
 
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
+#: src/cli/fs/gnunet-download.c:189
 #, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "��и����м ус������ ���� на��ем %s ад��есу ���� „%s“.\n"
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "������у������а��е „%s“ ��е ����тово (%s/сек).\n"
 
-#: src/arm/gnunet-service-arm.c:951
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
 #, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Н��сам усп��о ���� ������р������м ����л������ „%s“\n"
+msgid "Unexpected status: %d\n"
+msgstr "Неоч����������н�� с������е: %d\n"
 
-#: src/arm/gnunet-service-arm.c:962
+#: src/cli/fs/gnunet-download.c:234
+msgid "You need to specify a URI argument.\n"
+msgstr "Треба да наведете УРИ аргумент.\n"
+
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
 #, c-format
-msgid "Starting service `%s'\n"
-msgstr "����к����ћ���� ус��у��у ���%s“\n"
+msgid "Failed to parse URI: %s\n"
+msgstr "��������м ус����о да об��адим УРИ: %s\n"
 
-#: src/arm/gnunet-service-arm.c:1062
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr "Подржани су само CHK или LOC УРИ.\n"
+
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr "Назив циљне датотеке мора бити наведен.\n"
+
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
 #, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Не могу да направим прикључницу за услугу „%s“: %s\n"
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Не могу да покренем „%s“ субсистем.\n"
+
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "поставља жељени НИВО анонимности примаоца"
+
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr "брише недовршена преузимања (када се прекине са КТРЛ-Ц)"
+
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
+msgstr "тражи само локалног парњака (без претраге П2П мреже)"
+
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
+msgstr "уписује датотеку у НАЗИВ_ДАТОТЕКЕ"
+
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr "поставља највећи број паралелних преузимања који је дозвољен"
+
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr "поставља највећи број паралелних захтева за блокове који је дозвољен"
+
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
+msgstr "преузима ГНУнет директоријум дубински"
+
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+"Преузима датотеке са ГНУнет-а користећи ГНУнет CHK или LOC УРИ (gnunet://fs/"
+"chk/...)"
+
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr "исписује списак свих индексираних датотека"
+
+#: src/cli/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr "Посебне радње дељења датотека"
 
-#: src/arm/gnunet-service-arm.c:1093
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgstr "Објављујем „%s“ при %llu/%llu (преостаје %s)\n"
+
+#: src/cli/fs/gnunet-publish.c:247
+#, c-format
+msgid "Error publishing: %s.\n"
+msgstr "Грешка објављивања: %s.\n"
+
+#: src/cli/fs/gnunet-publish.c:255
+#, c-format
+msgid "Publishing `%s' done.\n"
+msgstr "Објављивање „%s“ је готово.\n"
+
+#: src/cli/fs/gnunet-publish.c:259
+#, c-format
+msgid "URI is `%s'.\n"
+msgstr "УРИ је „%s“.\n"
+
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "УРИ је „%s“.\n"
+
+#: src/cli/fs/gnunet-publish.c:280
+#, fuzzy
+msgid "Starting cleanup after abort\n"
+msgstr "Чисти након обављеног прекидања.\n"
+
+#: src/cli/fs/gnunet-publish.c:287
+#, fuzzy
+msgid "Cleanup after abort completed.\n"
+msgstr "Чисти након обављеног прекидања.\n"
+
+#: src/cli/fs/gnunet-publish.c:292
+#, fuzzy
+msgid "Cleanup after abort failed.\n"
+msgstr "Чисти након обављеног прекидања.\n"
+
+#: src/cli/fs/gnunet-publish.c:426
+#, c-format
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "Мета подаци за датотеку „%s“ (%s)\n"
+
+#: src/cli/fs/gnunet-publish.c:428
+#, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "Кључне речи за датотеку „%s“ (%s)\n"
+
+#: src/cli/fs/gnunet-publish.c:583
+msgid "Could not publish\n"
+msgstr "Не могу да објавим\n"
+
+#: src/cli/fs/gnunet-publish.c:612
+msgid "Could not start publishing.\n"
+msgstr "Не могу да покренем објављивање.\n"
+
+#: src/cli/fs/gnunet-publish.c:645
+#, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Скенирам директоријум „%s“.\n"
+
+#: src/cli/fs/gnunet-publish.c:647
+#, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Скенирам датотеку „%s“.\n"
+
+#: src/cli/fs/gnunet-publish.c:653
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr "Било је проблема обраде датотеке „%s“, прескачем је.\n"
+
+#: src/cli/fs/gnunet-publish.c:659
+msgid "Preprocessing complete.\n"
+msgstr "Предодбрада је завршена.\n"
+
+#: src/cli/fs/gnunet-publish.c:665
+#, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Извлачење мета података из датотеке „%s“ је завршено.\n"
+
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
+msgstr "Извлачење мета података је завршено.\n"
+
+#: src/cli/fs/gnunet-publish.c:679
+#, fuzzy
+msgid "Error scanning directory.\n"
+msgstr "Унутрашња грешка скенирања директоријума.\n"
+
+#: src/cli/fs/gnunet-publish.c:706
+#, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Изабрани псеудоним „%s“ је непознат\n"
+
+#: src/cli/fs/gnunet-publish.c:738
+#, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Нисам успео да приступим „%s“: %s\n"
+
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
-"Не могу да увежем прикључницу ослушкивања за услугу „%s“ на адресу „%s“: %s\n"
+"Нисам успео да покренем скенер мета директоријума.  Да ли је инсталиран "
+"„gnunet-helper-publish-fs“?\n"
 
-#: src/arm/gnunet-service-arm.c:1124
+#: src/cli/fs/gnunet-publish.c:811
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr "����Р с������ ��а������е��а ��е���� ��а ��с��у��и „%s“ ��а „%s“\n"
+msgid "Cannot extract metadata from a URI!\n"
+msgstr "���� ������у ��а ������уче�� ��ет���������������� из ����И-ј��!\n"
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/fs/gnunet-publish.c:818
 #, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "��р������е��а�� с�� да за�������������� „%s“\n"
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "��ор��т�� наве��т�� ј����а�� и с��мо ј����ан ��а����в д����от������ ��а уметање.\n"
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/fs/gnunet-publish.c:824
 #, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "������о���� ������ре������ ус�������� „%s“.\n"
+msgid "You must NOT specify an URI and a filename.\n"
+msgstr "���� ��о����те ������е��т�� ��РИ �� назив да������еке.\n"
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
-msgstr "излази"
+#: src/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "Опција „%s“ се захтева приликом коришћења опције „%s“.\n"
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
-msgstr "сигнал"
+#: src/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr "Опција „%s“ нема смисла без опције „%s“.\n"
 
-#: src/arm/gnunet-service-arm.c:1765
-msgid "unknown"
-msgstr "непознато"
+#: src/cli/fs/gnunet-publish.c:907
+#, fuzzy
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr "искључује додавање времена стварања метаподацима утоварене датотеке"
+
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"исписује списак извучених кључних речи које ће се користити, али не обавља "
+"утовар"
+
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"додаје додатну кључну реч за датотеку највишег нивоа или директоријум (ова "
+"опција се може навести више пута)"
+
+#: src/cli/fs/gnunet-publish.c:928
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr "поставља мета-податке за дату ВРСТУ за дату ВРЕДНОСТ"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"не индексира, обавља пуно уметање (смешта читаву датотеку у шифрованом "
+"облику у ГНУнет базу података)"
+
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"наводи ИБ ажурираног издања које ће бити објављено у будућности (само за "
+"уметања називног простора)"
+
+#: src/cli/fs/gnunet-publish.c:953
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
+"објављује датотеке под псеудонимом НАЗИВ (ставља датотеку у називни простор)"
+
+#: src/cli/fs/gnunet-publish.c:965
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+"само опонаша процес али не чини никакво актуелно објављивање (корисно за "
+"прорачун УРИ-ја)"
+
+#: src/cli/fs/gnunet-publish.c:972
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+"поставља ИБ овог издања објављивања (само за уметања називног простора)"
+
+#: src/cli/fs/gnunet-publish.c:980
+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/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
+msgstr "Објављује датотеку или директоријум на ГНУнет-у"
+
+#: src/cli/fs/gnunet-search.c:446
 #, c-format
-msgid "Service `%s' took %s to terminate\n"
-msgstr "Услуга „%s“ је узела %s да оконча\n"
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr "Нисам успео да пишем директоријум са резултатима претраге за „%s“\n"
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/fs/gnunet-search.c:535
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
+msgid "Error searching: %s.\n"
+msgstr "Грешка претраге: %s.\n"
+
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
 msgstr ""
-"Услуга „%s“ је окончана нормално, поново ће се покренути у било које време\n"
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/fs/gnunet-search.c:602
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "Conflicting options --bookmark-only and --output.\n"
 msgstr ""
-"Услуга „%s“ је окончана са стањем %s/%d, поново ће се покренути за %s\n"
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
-msgstr "Започињем гашење као што је затражио клијент.\n"
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
+msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/fs/gnunet-search.c:629
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Не могу да створим УРИ кључне речи из аргумената.\n"
+
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/fs/gnunet-search.c:662
+#, fuzzy, c-format
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr "Не могу да покренем „%s“ субсистем.\n"
+
+#: src/cli/fs/gnunet-search.c:676
+msgid "Could not start searching.\n"
+msgstr "Не могу да покренем претрагу.\n"
+
+#: src/cli/fs/gnunet-search.c:702
+#, fuzzy
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr "поставља жељени НИВО анонимности примаоца"
+
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
+msgstr "самостално окончава претрагу након што су пронађени резултати ВРЕДНОСТ"
+
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:789
 #, fuzzy
-msgid "duration until auction starts"
-msgstr "застој док не започне концензус"
+msgid "Search for files that have been published on GNUnet\n"
+msgstr "Претражује ГНУнет за датотекама које су објављене на ГНУнет-у"
+
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr "Поништавам индексирање при %llu/%llu (преостаје %s)\n"
+
+#: src/cli/fs/gnunet-unindex.c:103
+#, c-format
+msgid "Error unindexing: %s.\n"
+msgstr "Грешка поништавања индексирања: %s.\n"
+
+#: src/cli/fs/gnunet-unindex.c:109
+msgid "Unindexing done.\n"
+msgstr "Поништавање индексирања је готово.\n"
+
+#: src/cli/fs/gnunet-unindex.c:142
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr ""
+"Морате навести један и само један назив датотеке за поништавање "
+"индексирања.\n"
+
+#: src/cli/fs/gnunet-unindex.c:162
+msgid "Could not start unindex operation.\n"
+msgstr "Не могу да започнем радњу поништавања индексирања.\n"
+
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+"Поништава индексирање датотеке која је претходно била индексирана са „gnunet-"
+"publish“."
+
+#: src/cli/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "„%s“ није исправна ИП адреса.\n"
 
-#: src/auction/gnunet-auction-create.c:187
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Нисам успео да претворим ДНС ИДНА „%s“ у УТФ-8: %s\n"
+
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr "Претражује запис за датим називом"
+
+#: src/cli/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr "Наводи врсту записа за претраживање"
+
+#: src/cli/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Наводи време истека за претраживање"
+
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr "Нема непотребног излаза"
+
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:374
+msgid "GNUnet GNS resolver tool"
+msgstr "Алат ГНУнет ГНС решавача"
+
+#: src/cli/identity/gnunet-identity.c:225
+#, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Нисам успео да направим его: %s\n"
+
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
+msgstr "ствара НАЗИВ ега"
+
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
+msgstr "брише НАЗИВ ега "
+
+#: src/cli/identity/gnunet-identity.c:551
 msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
-msgid "public auction outcome"
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+msgstr ""
+
+#
+# File: util/dialtest.c++, line: 134
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
+msgstr "приказује све егое"
+
+#: src/cli/identity/gnunet-identity.c:576
+#, fuzzy
+msgid "reduce output"
+msgstr "опширан излаз"
+
+#: src/cli/identity/gnunet-identity.c:583
+#, fuzzy
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+"поставља основни идентитет на ЕГО за подсистем ПОДСИСТЕМ (користите заједно "
+"са -s)"
+
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
+msgstr "ради у режиму праћења егоа"
+
+#: src/cli/identity/gnunet-identity.c:597
+msgid "display private keys as well"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
+msgstr "Одржава егое"
+
+#: src/cli/namecache/gnunet-namecache.c:105
+#, c-format
+msgid "No records found for `%s'"
+msgstr "Нисам нашао записе за „%s“"
+
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr "\tОштећен или неподржан запис врсте %u\n"
+
+#: src/cli/namecache/gnunet-namecache.c:174
+#, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Морате навести којој зони се треба приступити\n"
+
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
+
+#: src/cli/namecache/gnunet-namecache.c:187
+#, c-format
+msgid "You must specify a name\n"
+msgstr "Морате навести назив\n"
+
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
+msgstr "назив записа за додавање/брисање/приказ"
+
+#: src/cli/namecache/gnunet-namecache.c:220
+#, fuzzy
+msgid "specifies the public key of the zone to look in"
+msgstr "наводи јавни кључ зоне за претраживање"
+
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+msgid "GNUnet zone manipulation tool"
+msgstr "Алат манипуслисања ГНУнет зоном"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "Алат манипуслисања ГНУнет зоном"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "Его „%s“ није познат услузи идентитета\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "Регуларни израз „%s“ је превелик!\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Нисам успео да обрадим УРИ: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Нисам успео да обрадим УРИ: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Кључ „%s“ је исправан\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+msgid "name of the ego controlling the zone"
+msgstr "назив егоа који контролише зону"
+
+#: src/cli/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Непозната наредба „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Неисправан формат за ИП: „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr "Додавање записа није успело: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Брисање записа није успело%s%s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, fuzzy, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr "Нема позива који би могао бити отказан управо сада.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1302
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1327
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1356
+#, c-format
+msgid "No options given\n"
+msgstr "Нису дате опције\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1370
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Недостаје опција „%s“ за радњу „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1381
+msgid "name"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1410
+#, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Неисправан надимак „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr "додај"
+
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Неподржана врста „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1471
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr "Вредност „%s“ је неисправна за врсту записа „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Неисправан формат времена „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr "обриши"
+
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Неисправан УРИ „%s“\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Нисам успео да се повежем са смештајем назива\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Не могу да се повежем са услугом идентитета\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr "додаје запис"
+
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr "брише запис"
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr "приказује записе"
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2004
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr "време истека записа за коришћење (само за додавање), „never“ је могуће"
+
+#: src/cli/namestore/gnunet-namestore.c:2010
+msgid "set the desired nick name for the zone"
+msgstr "поставља жељени назив надимка за зону"
+
+#: src/cli/namestore/gnunet-namestore.c:2015
+msgid "monitor changes in the namestore"
+msgstr "прати измене у смештају назива"
+
+#: src/cli/namestore/gnunet-namestore.c:2025
+msgid "Output in recordline format"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2031
+#, fuzzy
+msgid "determine our name for the given KEY"
+msgstr "одређује наш назив за дати „PKEY“"
+
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
+msgstr "врста записа за додавање/брисање/приказ"
+
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
+msgstr "УРИ за увоз у нашу зону"
+
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
+msgstr "вредност записа за додавање/брисање"
+
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
+msgstr "ствара или исписује јавни запис"
+
+#: src/cli/namestore/gnunet-namestore.c:2056
+#, fuzzy
+msgid "omit private records"
+msgstr "приказује записе"
+
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+"прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
+
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr "Недостају поставке подешавања кључа.\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Нисам успео да уклоним датотеку подешавања „%s“\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Не могу да приступим датотеци подешавања „%s“\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "# пријатељи у подешавањима"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "Демон помоћника теста ГНУнет НАТ попречника"
+
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:464
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr "Демон помоћника теста ГНУнет НАТ попречника"
+
+#: src/cli/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr "Показује процене величине мреже из НСЕ услуге."
+
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Потребна је исправна врста\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "аргумент „--section“ је потребан\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:852
+msgid "The EGO to use"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Покрећем %s...\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Кључ „%s“ је исправан\n"
+
+#: src/cli/revocation/gnunet-revocation.c:150
+#, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "Тастер „%s“ је опозван\n"
+
+#: src/cli/revocation/gnunet-revocation.c:154
+msgid "Internal error\n"
+msgstr "Унутрашња грешка\n"
+
+#: src/cli/revocation/gnunet-revocation.c:180
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr "Кључ за его „%s“ још увек важи, опозивање није успело (!)\n"
+
+#: src/cli/revocation/gnunet-revocation.c:183
+msgid "Revocation failed (!)\n"
+msgstr "Опозивање није успело (!)\n"
+
+#: src/cli/revocation/gnunet-revocation.c:189
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr "Кључ за его „%s“ је успешно опозван\n"
+
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
+msgstr "Опозивање је успело.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
+msgstr "Унутрашња грешка, опозив кључа можда није успео\n"
+
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr "Уверење опозива за „%s“ је смештено у „%s“\n"
+
+#: src/cli/revocation/gnunet-revocation.c:334
+#, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "Нисам нашао его „%s“.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:350
+#, fuzzy, c-format
+msgid "Error: Key is invalid\n"
+msgstr "Кључ „%s“ је исправан\n"
+
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr "Грешка: уверење опозива у „%s“ није за „%s“\n"
+
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
+msgstr "Уверење опозива је спремно\n"
+
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr "Уверење опозива није спремно, израчунавам доказ о раду\n"
+
+#: src/cli/revocation/gnunet-revocation.c:424
+#, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "Јавни кључ „%s“ је лош\n"
+
+#: src/cli/revocation/gnunet-revocation.c:434
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+"Тестирање и опозивање у исто време није дозвољено, само тестирање "
+"извршавам.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:464
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Није дат назив датотеке за смештање уверења опозива.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:481
+#, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Нисам успео да прочитам уверење опозива из „%s“\n"
+
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "Уверење опозива за „%s“ је смештено у „%s“\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+msgid "No action specified. Nothing to do.\n"
+msgstr "Није наведена ниједна радња. Немам шта да радим.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
+msgstr "користи НАЗИВ за назив датотеке опозивања"
+
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
+msgstr "опозива лични кључ придружен личном кључу са его НАЗИВОМ "
+
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
+msgstr "заправо обавља опозив, у супротном само радимо предизрачунавање"
+
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
+msgstr "тестира да ли је јавни кључ КЉУЧ опозван"
+
+#: src/cli/revocation/gnunet-revocation.c:558
+msgid "number of epochs to calculate for"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
 msgid "help text"
 msgstr "текст помоћи"
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+msgid "Failed to obtain statistics.\n"
+msgstr "Нисам успео да добијем статистику.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
 #, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Н����с������������ И�� ��а������ка „%s“\n"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Нис��м ��с������ ��а ��оби������ ста��и��т��ку ��д дом��ћина „%s:%llu“\n"
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
+msgstr "Недостаје аргумент: подсистем \n"
+
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
+msgstr "Недостаје аргумент: назив\n"
+
+#: src/cli/statistics/gnunet-statistics.c:577
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "No subsystem or name given\n"
+msgstr "Није дат подсистем или назив\n"
+
+#: src/cli/statistics/gnunet-statistics.c:589
+#, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "Нисам успео да покренем рутину гледања\n"
+
+#: src/cli/statistics/gnunet-statistics.c:725
+#, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Неисправан аргумент „%s“\n"
+
+#: src/cli/statistics/gnunet-statistics.c:742
+#, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Потребан је прикључник за повезивање са домаћином „%s“\n"
+
+#: src/cli/statistics/gnunet-statistics.c:751
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
+"Прикључник треба бити између 1 и 65535 за повезивање са домаћином „%s“\n"
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/statistics/gnunet-statistics.c:783
 #, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Неисправна мета „%s“\n"
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:775
-msgid "No action requested\n"
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
+msgstr "ограничава излаз на статистику за дати НАЗИВ"
+
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
+msgstr "чини да вредност бива постављена трајном"
+
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
+msgstr "ограничава излаз на дати ПОДСИСТЕМ"
+
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
+msgstr "само исписује вредност статистике"
+
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
+msgstr "гледа вредност непрекидно"
+
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
+msgstr "повезује се са удаљеним домаћином"
+
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
+msgstr "прикључник за удаљеног домаћина"
+
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
+msgstr "Исписује статистику о ГНУнет радњама."
+
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:800
+#: src/cli/util/gnunet-config.c:192
+msgid "Manipulate GNUnet configuration files"
+msgstr "Управља ГНУнет датотекама подешавања"
+
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:95
+#, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Нисам успео да отворим „%s“: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:129
+#, fuzzy, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr "Стварам %u кључа, сачекајте"
+
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr "Стварам %u кључа, сачекајте"
+
+#: src/cli/util/gnunet-ecc.c:178
+#, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr ""
+"\n"
+"Нисам успео да пишем у „%s“: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:185
+#, c-format
+msgid ""
+"\n"
+"Finished!\n"
+msgstr ""
+"\n"
+"Завршено!\n"
+
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+"\n"
+"Грешка, %u кључа нису створена\n"
+
+#: src/cli/util/gnunet-ecc.c:304
+#, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "Нисам нашао датотеку кључа домаћина „%s“\n"
+
+#: src/cli/util/gnunet-ecc.c:314
+#, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "Датотека кључа домаћина „%s“ је празна\n"
+
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr "Нетачан формат датотеке кључа домаћина: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:334
+#, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "Не могу да прочитам датотеку кључа домаћина: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
+msgstr "Није наведена датотека кључа домаћина на линији наредби\n"
+
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
+msgstr "исписује кључеве укључене у датотеци (за тестирање)"
+
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
+msgstr "број кључева за испис укључених у датотеци (за тестирање)"
+
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr "ствара БРОЈ пара јавног-личног кључа (за тестирање)"
+
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
+msgstr "исписује јавни кључ у АСКРИ формату"
+
+#: src/cli/util/gnunet-ecc.c:474
 #, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "������збе��ује ��������тке о ����р��ч��т���� ������и"
+msgid "print the private key in ASCII format"
+msgstr "��с������ује ј�������� кључ у ��������И ф��р����ту"
 
-#: src/cadet/gnunet-cadet.c:804
+#: src/cli/util/gnunet-ecc.c:479
 #, fuzzy
-msgid "Activate echo mode"
-msgstr "��������е��е ������и�� ����оа"
+msgid "print the public key in HEX format"
+msgstr "��с��������је ���������� ��ључ у ��СКРИ ��ор����ту"
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr "исписује примере ЕЦЦ операција (користи се за тестирање сагласности)"
+
+#: src/cli/util/gnunet-ecc.c:499
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "Управља ГНУнет датотекама личног ЕЦЦ кључа"
+
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Нисам успео да обрадим УРИ: %s\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "Неисправан УРИ „%s“\n"
+
+#: src/cli/util/gnunet-qr.c:161
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
+msgstr "Неисправна путања: не почиње са „%s“\n"
+
+#: src/cli/util/gnunet-qr.c:171
+#, fuzzy, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
+msgstr "Неисправна путања: није успело навођење подсистема\n"
+
+#: src/cli/util/gnunet-qr.c:182
+#, fuzzy, c-format
+msgid "No known handler for subsystem `%s'\n"
+msgstr "Није познат руковалац за подсистем „%s“\n"
+
+#: src/cli/util/gnunet-qr.c:218
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
+
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Нисам успео да отворим „%s“: %s\n"
+
+#: src/cli/util/gnunet-qr.c:261
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "Покрећем %s...\n"
+
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
+#, c-format
+msgid "Found %s: \"%s\"\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "„%s“ није ГНУнет директоријум\n"
+
+#: src/cli/util/gnunet-qr.c:546
 #, fuzzy
-msgid "Provide information about a patricular peer"
-msgstr "обезбеђује податке о нарочитом тунелу"
+msgid "No data found\n"
+msgstr "нисам нашао „upnpc“\n"
+
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
+msgstr "обавља повратну претрагу"
+
+#: src/cli/util/gnunet-resolver.c:183
 #, fuzzy
-msgid "Provide information about all peers"
-msgstr "обезбеђује податке о свим парњацима"
+msgid "Use built-in GNUnet stub resolver"
+msgstr "Користи уграђеног заменског решавача ГНУнет-а"
+
+#: src/cli/util/gnunet-scrypt.c:215
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Учитавање кључа домаћина из „%s“ није успело.\n"
+
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+msgid "Value is too large.\n"
+msgstr "Вредност је превелика.\n"
+
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
+msgstr "број битова за тражење доказивања о раду"
+
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
+msgstr "датотека са личним кључем, у супротном користи се основна"
+
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
+msgstr "датотека са доказом о раду, у супротном користи се основна"
+
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
+msgstr "време за чекање између прорачуна"
+
+#: src/cli/util/gnunet-scrypt.c:313
+msgid "Manipulate GNUnet proof of work files"
+msgstr "Управља ГНУнет датотекама доказа о раду"
+
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr "Није наведена путања на линији наредби\n"
+
+#: src/cli/util/gnunet-uri.c:95
+#, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Неисправна путања: не почиње са „%s“\n"
+
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr "Неисправна путања: није успело навођење подсистема\n"
+
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr "Није познат руковалац за подсистем „%s“\n"
 
-#: src/cadet/gnunet-cadet.c:827
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
+msgstr "Обавља основне радње за путање ГНУнет-а"
+
+#: src/cli/vpn/gnunet-vpn.c:142
+msgid "Error creating tunnel\n"
+msgstr "Грешка стварања тунела\n"
+
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
+#, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Опција „%s“ нема смисла са опцијом „%s“.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:202
+#, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "Опција „%s“ или „%s“ је потребна.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:216
+#, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Опција „%s“ или „%s“ се захтева приликом коришћења опције „%s“.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:239
+#, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "„%s“ није исправан одредник парњака.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:258
+#, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "„%s“ није исправна ИП адреса.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
+msgstr "захтева да резултат треба да буде ИПв4 адреса"
+
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
+msgstr "захтева да резултат треба да буде ИПв6 адреса"
+
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr "колико дуго мапирање треба бити важеће за нове тунеле?"
+
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
+msgstr "ИП одредишта за тунел"
+
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
+msgstr "парњак који нуди услугу којој желимо да приступимо"
+
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
+msgstr "назив услуге којој желимо да приступимо"
+
+#: src/cli/vpn/gnunet-vpn.c:334
+msgid "service is offered via TCP"
+msgstr "услуга се нуди путем ТЦП-а"
+
+#: src/cli/vpn/gnunet-vpn.c:339
+msgid "service is offered via UDP"
+msgstr "услуга се нуди путем УДП-ом"
+
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr "Поставља тунеле путем ВПН-а."
+
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Јавни кључ „%s“ није добро оформљен\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:566
 #, fuzzy
-msgid "Provide information about all tunnels"
-msgstr "обезбеђује податке о свим тунелима"
+msgid "Ego does not exist!\n"
+msgstr "Број кључа %u не постоји\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Јавни кључ „%s“ није добро оформљен\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Нисам успео да се повежем са ГНС-ом\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, fuzzy, c-format
+msgid "ego required\n"
+msgstr "Потребна је исправна врста\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:890
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Јавни кључ „%s“ није добро оформљен\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:983
+#, fuzzy, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr "Наведите назив за тражење!\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1011
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1025
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "Наводи јавни кључ зоне у којој ће се тражити запис"
+
+#: src/contrib/service/abd/gnunet-abd.c:1030
+msgid "The ego/zone name to use"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1098
+#, fuzzy
+msgid "GNUnet abd resolver tool"
+msgstr "Алат ГНУнет ГНС решавача"
+
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+#, fuzzy
+msgid "duration until auction starts"
+msgstr "застој док не започне концензус"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
+msgstr ""
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 "Веза са услугом конверзације је изгубљена, покушавам поново да се повежем\n"
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
@@ -602,7 +2521,7 @@ msgstr ""
 "\n"
 "Крај преноса.  Нека вам је ГНУ дан.\n"
 
-#: src/conversation/gnunet-conversation-test.c:146
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -613,7 +2532,7 @@ msgstr ""
 "Сада пуштамо ваш снимак.  Ако можете да га чујете, ваша подешавања звука су "
 "добра..."
 
-#: src/conversation/gnunet-conversation-test.c:218
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
@@ -621,137 +2540,137 @@ msgid ""
 msgstr ""
 "Сада ћемо вас снимати за %s. Након тог времена, снимак ће вам бити пуштен..."
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/contrib/service/conversation/gnunet-conversation.c:264
 #, fuzzy, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr "Долазни позив од „%s“. /прихватите #%u или /откажите %u позив.\n"
 
-#: src/conversation/gnunet-conversation.c:287
+#: src/contrib/service/conversation/gnunet-conversation.c:287
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr "Позив од „%s“ је окончан\n"
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr "Позив од „%s“ је обуставио други корисник\n"
 
-#: src/conversation/gnunet-conversation.c:325
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr "Позив од „%s“ је повратио други корисник\n"
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr "Его „%s“ није више доступан, телефон је сада искључен.\n"
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/contrib/service/conversation/gnunet-conversation.c:356
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Нисам успео да подесим телефон (унутрашња грешка)\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, fuzzy, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 "Телефон је активан на линији %u.  Упишите „/help“ за списак доступних "
 "наредби\n"
 
-#: src/conversation/gnunet-conversation.c:391
+#: src/contrib/service/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr "Реших адресу за „%s“. Сада звоним на другој журци.\n"
 
-#: src/conversation/gnunet-conversation.c:398
+#: src/contrib/service/conversation/gnunet-conversation.c:398
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Веза је успостављена са „%s“\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Нисам успео да решим „%s“\n"
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Позив од „%s“ је окончан\n"
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr "Веза са „%s“ је обустављена (други корисник)\n"
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr "Веза са „%s“ је повраћена (други корисник)\n"
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Error with the call, restarting it\n"
 msgstr "Грешка са позивом, поново га покрећем\n"
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Непозната наредба „%s“\n"
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr "Его „%s“ није доступан\n"
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr "Већ позивате некога, спустите прво слушалицу!\n"
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 "Одговарате на позив од „%s“, спустите слушалицу или обуставите тај позив!\n"
 
-#: src/conversation/gnunet-conversation.c:548
+#: src/contrib/service/conversation/gnunet-conversation.c:548
 #, c-format
 msgid "Call recipient missing.\n"
 msgstr "Недостаје прималац позива.\n"
 
-#: src/conversation/gnunet-conversation.c:607
+#: src/contrib/service/conversation/gnunet-conversation.c:607
 #, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr "Нема долазног позива овде за прихватање!\n"
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/contrib/service/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr "Нема долазног позива „%s“ за прихватање управо сада!\n"
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/contrib/service/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr "Тренутно немамамо адресу.\n"
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/contrib/service/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr "Тренутно покушавамо да лоцирамо лични кључ за его „%s“.\n"
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/contrib/service/conversation/gnunet-conversation.c:680
 #, fuzzy, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr "Ослушкујемо за долазним позивима за его „%s“ на линији %u.\n"
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr "Разговарате са „%s“.\n"
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/contrib/service/conversation/gnunet-conversation.c:696
 #, c-format
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
@@ -760,82 +2679,82 @@ msgstr ""
 "Имали смо унутрашњу грешку подешавајући нашу телефонску линију. Још увек "
 "можете обављати позиве.\n"
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/contrib/service/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "Покушавамо да нађемо мрежну адресу за позив „%s“.\n"
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/contrib/service/conversation/gnunet-conversation.c:711
 #, fuzzy, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr "Позивамо „%s“, његов телефон треба да звони.\n"
 
-#: src/conversation/gnunet-conversation.c:728
+#: src/contrib/service/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr "Чекање позива:\n"
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u: „%s“\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr "Нема позива који би могао бити обустављен управо сада.\n"
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr "Нема позива који би могао бити повраћен управо сада.\n"
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr "Већ разговарате са „%s“, не можете повратити позив управо сада.\n"
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr "Нема долазног позива овде за повраћај!\n"
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/contrib/service/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr "Нема долазног позива „%s“ за повраћај управо сада!\n"
 
-#: src/conversation/gnunet-conversation.c:891
+#: src/contrib/service/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr "Нема позива који би могао бити отказан управо сада.\n"
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr "Нема долазног позива овде за одбијање!\n"
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/contrib/service/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr "Нема долазног позива „%s“ за одбијање управо сада!\n"
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/contrib/service/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 "Користите „/address“ да нађете коју адресу треба да има овај телефон у ГНС-у"
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/contrib/service/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr "Користите „/call USER.gnu“ да позовете КОРИСНИКА"
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/contrib/service/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr "Користтие „/accept #NUM“ да прихватите долазни позив #БРОЈ"
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/contrib/service/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr "Користите „/suspend“ да обуставитеактивни позив"
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
@@ -844,331 +2763,1788 @@ msgstr ""
 "повраћај долазних позива, аргумент није потребан за повраћај тренутно "
 "одлазног позива."
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/contrib/service/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr "Користите „/cancel“ да одбаците или окончате позив"
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/contrib/service/conversation/gnunet-conversation.c:958
 msgid "Use `/status' to print status information"
 msgstr "Користите „/status“ да испишете податке о стању"
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/contrib/service/conversation/gnunet-conversation.c:961
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Користите „/quit“ да окончате „gnunet-conversation“"
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/contrib/service/conversation/gnunet-conversation.c:964
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Користите „/help наредба“ да добијете помоћ за неку наредбу"
 
-#: src/conversation/gnunet-conversation.c:1124
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Назив нашег ега је промењен у „%s“\n"
 
-#: src/conversation/gnunet-conversation.c:1134
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Наш его „%s“ је обрисан!\n"
 
-#: src/conversation/gnunet-conversation.c:1166
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Морате навести НАЗИВ егоа за коришћење\n"
 
-#: src/conversation/gnunet-conversation.c:1193
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
 #, fuzzy
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr "поставља НАЗИВ егоа за коришћење за телефон (и решавање назива)"
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr "поставља РЕД за коришћење за телефон"
 
-#: src/conversation/gnunet-conversation.c:1218
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr "Укључује могућност конверзације са другим ГНУнет корисницима."
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Грешка читања са СТНДУЛАЗА: %d %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "Није успело „pa_stream_write()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr "gnunet-helper-audio-playback – Добих сигнал, излазим\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
 msgid "Connection established.\n"
 msgstr "Веза је успостављена.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "Није успело „pa_stream_new()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr "Није успело „pa_stream_connect_playback()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr "Неуспешно повезивање: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
 msgid "Wrong Spec\n"
 msgstr "Погрешна спец\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Није успело „pa_mainloop_new()“.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
 msgid "pa_context_new() failed.\n"
 msgstr "Није успело „pa_context_new()“.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "Није успело „pa_context_connect()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Није успело „pa_mainloop_run()“.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr "Грешка читања са СТНДУЛАЗА: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "Није успело „opus_encode_float()“: %s. Прекидам\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
 #, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "Није успело „pa_stream_peek()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr "Добих сигнал, излазим.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:504
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
 msgid "Stream successfully created.\n"
 msgstr "Ток је успешно направљен.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:509
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "Није успело „pa_stream_get_buffer_attr()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr "Мере бафера: maxlength=%u, fragsize=%u\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr "Користим спецификацију узорка „%s“, мапа канала „%s“.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "Повезан са уређајем %s (%u, %sобустављено).\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr "Грешка тока: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "Није успело „pa_stream_connect_record()“: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:703
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
 msgid "ogg_stream_init() failed.\n"
 msgstr "Није успело „ogg_stream_init()“.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Нисам успео да доделим %d бајта за други пакет\n"
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Не могу да се повежем са „%s“ услугом!\n"
 
-#: src/conversation/microphone.c:118
+#: src/contrib/service/conversation/microphone.c:118
 msgid "Could not start record audio helper\n"
 msgstr "Не могу да покренем помоћника аудио снимања\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, fuzzy, c-format
 msgid "PHONE version %u not supported\n"
 msgstr "Протокол %u није подржан, одбацујем\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Не могу да обрадим ТЕЛЕФОНСКИ снимак „%s“\n"
 
-#: src/conversation/speaker.c:73
+#: src/contrib/service/conversation/speaker.c:73
 msgid "Could not start playback audio helper.\n"
 msgstr "Не могу да покренем помоћника аудио пуштања.\n"
 
-#: src/core/gnunet-core.c:91
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
 #, fuzzy
-msgid "fresh connection"
-msgstr "# ������� ���� �������"
+msgid "number of peers to start"
+msgstr "��р��ј ����������ка у ��о��цен��усу"
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
 #, fuzzy
-msgid "key received"
-msgstr "# ������у��т��ти с�� пр��м������и"
+msgid "timeout for the profiling"
+msgstr "����������и в��еме и����ека ��а ��р����р����ивање"
 
-#: src/core/gnunet-core.c:103
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
 #, fuzzy
-msgid "connection established"
-msgstr "������а ���� ус��ост��в��ен��.\n"
+msgid "number of PeerIDs to request"
+msgstr "��р��ј ��а��њ��ка у ��о����ен��усу"
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "Мери квалитет и учинковитост НСЕ услуге."
+
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Морате навести бар један ИБ поруке за проверу!\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr "Овом програму је потребан одредник сесије за поређење вектора.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
 msgstr ""
+"Покушах да поставим режим покретача, јер је ИБ парњака био дат. Било како "
+"било, „%s“ није добар одредник парњака.\n"
 
-#: src/core/gnunet-core.c:111
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
 #, fuzzy
-msgid "disconnected"
-msgstr "Прекинута је веза са"
+msgid "Need elements to compute the scalarproduct, got none.\n"
+msgstr ""
+"Потребни су елементи за израчунавање производа вектора, нисам добио "
+"ниједан.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Лоша политика прикључника „%s“\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Не могу да претворим „%s“ у „int32_t“.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
 
-#: src/core/gnunet-core.c:120
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+"Зарезом раздвојен списак елемената за поређење као вектора са нашим удаљеним "
+"парњаком."
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+"[Изборни] парњак са којим израчунавамо наш скаларни производ. Ако тај "
+"параметар није дат, услуга ће чекати да удаљени парњак прорачуна захтев."
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
+msgstr "ИБ преноса дељеног са парњаком."
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr "Израчунава Производ вектора са ГНУнет парњаком."
+
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
 #, fuzzy
-msgid "Connection to CORE service lost (reconnecting)"
+msgid "Connect to CADET failed\n"
+msgstr "Повезивање са МЕШОМ није успело\n"
+
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
-"Веза са услугом конверзације је изгубљена, покушавам поново да се повежем\n"
 
-#: src/core/gnunet-core.c:124
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
+msgid "number of peers in consensus"
+msgstr "број парњака у концензусу"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
+msgstr "застој „dkg“ почетка"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
+msgstr "време истека „dkg“-а"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr "осетљивост"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
+msgstr "такође опис профила"
+
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
 #, fuzzy
-msgid "unknown state"
-msgstr "<непознато време>"
+msgid "Could not connect to CADET service\n"
+msgstr "Не могу да се повежем са „%s“ услугом!\n"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+msgid "number of element in set A-B"
+msgstr "број елемената у скупу A-B"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+msgid "number of element in set B-A"
+msgstr "број елемената у скупу B-A"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
+msgstr "број заједничких елемената у A и B"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr "хеш број"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr "„ibf“ величина"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+msgid "number of values"
+msgstr "број вредности"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+#, fuzzy
+msgid "operation to execute"
+msgstr "операција за извршавање"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+#, fuzzy
+msgid "element size"
+msgstr "експеримент за коришћење"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+#, fuzzy
+msgid "write statistics to file"
+msgstr "само исписује вредност статистике"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
+msgid "No error (success)."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "%.s Непознат код резултата."
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
+#, fuzzy
+msgid "Ego not found."
+msgstr "Нисам нашао садржај"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
+#, fuzzy
+msgid "Identifier already in use for another ego."
+msgstr "одредник се већ користи за други его"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "%.s Непознат код резултата."
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# Бирање парњака није успело"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
+#, fuzzy
+msgid "Zone not found."
+msgstr "Нисам нашао садржај"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
+#, fuzzy
+msgid "Record not found."
+msgstr "нисам нашао „upnpc“\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
+#, fuzzy
+msgid "No records given."
+msgstr "Није дат парњак!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
+msgid "Record data invalid."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
+#, fuzzy
+msgid "No label given."
+msgstr "Није дат парњак!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
+#, fuzzy
+msgid "No results given."
+msgstr "Нису дате опције\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
+#, fuzzy
+msgid "Record already exists."
+msgstr "назив мете већ постоји"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Смештај назива није успео да смести запис\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
+msgid "Label invalid or malformed."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
+msgstr ""
 
-#: src/core/gnunet-core.c:129
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
+#, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Грешка приступа датотеци „%s“: %s\n"
+
+#: src/lib/hello/gnunet-hello.c:310
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr "Датотека „%s“ је превелика да би била „HELLO“\n"
+
+#: src/lib/hello/gnunet-hello.c:315
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr "Датотека „%s“ је премала да би била „HELLO“\n"
+
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
+#, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Грешка отварања датотеке „%s“: %s\n"
+
+#: src/lib/hello/gnunet-hello.c:339
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "Нисам нашао лепо формирано „HELLO“ у датотеци „%s“\n"
+
+#: src/lib/hello/gnunet-hello.c:386
 #, fuzzy, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
-msgstr "%24s: %-17s %4s   (укупно повезивања: %u)\n"
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %s\n"
+
+#: src/lib/hello/gnunet-hello.c:395
+#, fuzzy, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
+msgstr "Измењених адреса — %u \n"
+
+#: src/lib/hello/gnunet-hello.c:409
+#, fuzzy
+msgid "Hello file to read"
+msgstr "пем датотека за коришћење као издавач уверења"
+
+#: src/lib/hello/gnunet-hello.c:418
+msgid "Print information about peers."
+msgstr "Исписује податке о парњацима."
+
+#: src/lib/hello/hello.c:1089
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Нисам успео да обрадим „HELLO“ поруку: недостаје време истека\n"
 
-#: src/core/gnunet-core.c:157
+#: src/lib/hello/hello.c:1099
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Нисам успео да обрадим „HELLO“ поруку: неисправно време истека\n"
+
+#: src/lib/hello/hello.c:1109
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Нисам успео да обрадим „HELLO“ поруку: лоша\n"
+
+#: src/lib/hello/hello.c:1121
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Нисам успео да обрадим „HELLO“ поруку: недостаје прикључак преноса\n"
+
+#: src/lib/hello/hello.c:1139
+#, fuzzy, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr "Нисам нашао прикључак „%s“\n"
+
+#: src/lib/hello/hello.c:1147
 #, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr "Прикључак „%s“ још не подржава УРИ-је\n"
+
+#: src/lib/hello/hello.c:1162
+#, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Нисам успео да обрадим „%s“ као адресу за прикључак „%s“\n"
+
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“: %s\n"
+
+#: src/lib/sq/sq.c:47
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Грешка при читању „%s“: %s"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr "Крај датотеке"
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Грешка при читању „%s“: %s"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
+msgstr ""
+
+#: src/lib/util/bio.c:312
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
 msgstr "Неисправан аргумент линије наредби „%s“\n"
 
-#: src/core/gnunet-core.c:163
-msgid "Failed to connect to CORE service!\n"
-msgstr "Нисам успео да се повежем са ЈЕЗГРЕНОМ услугом!\n"
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
-msgid "provide information about all current connections (continuously)"
-msgstr "обезбеђује податке о свим тренутним везама (непрекидно)"
+#: src/lib/util/bio.c:345
+#, c-format
+msgid "%s (while reading `%s')"
+msgstr ""
 
-#: src/core/gnunet-core.c:196
-msgid "Print information about connected peers."
-msgstr "Исписује податке о повезаним парњацима."
+#: src/lib/util/bio.c:350
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr "Грешка читања дужине ниске „%s“"
+
+#: src/lib/util/bio.c:363
+#, fuzzy, c-format
+msgid "String `%s' longer than allowed (%u > %lu)"
+msgstr "Ниска „%s“ је дужа од дозвољеног (%u > %u)"
+
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %s\n"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
+msgstr ""
+
+#: src/lib/util/bio.c:773
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Неисправан формат времена „%s“\n"
+
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr "ЈУНИКС_ПУТАЊА „%s“ је предуга, највећа дужина је %llu\n"
+
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr "Користим зато „%s“\n"
+
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr "Потребан је не-празан назив домаћина за услугу „%s“.\n"
+
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:910
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "Порука „%.*s“ је поновљена %u пута у прошлости %s\n"
+
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "ГРЕШКА"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "УПОЗОРЕЊЕ"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "ПОДАЦИ"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "ПРОЧИШЋАВАЊЕ"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr "НИШТА"
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr "НЕИСПРАВНО"
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr "непозната адреса"
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr "неисправна адреса"
+
+#: src/lib/util/common_logging.c:1416
+#, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "Подешавање није успело да наведе опцију „%s“ у одељку „%s“!\n"
+
+#: src/lib/util/common_logging.c:1431
+#, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+"Подешавање наводи неисправну вредност за опцију „%s“ у одељку „%s“: %s\n"
+
+#: src/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Нисам успео да уклоним датотеку подешавања „%s“\n"
+
+#: src/lib/util/configuration.c:1718
+msgid "Not a valid relative time specification"
+msgstr ""
+
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+"Вредност подешавања '%s' за '%s' у одељку '%s' није ус купу исправних "
+"избора\n"
+
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:148
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "аргумент „--section“ је потребан\n"
+
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr "аргумент „--option“ је потребан за постављање вредности\n"
+
+#: src/lib/util/configuration_helper.c:263
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Нисам успео да учитам подешавање за „%s“\n"
+
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+"Величина датотеке на диску није тачна за овај Блум филтер (желим %llu, имам "
+"%llu)\n"
+
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "„%s“ није успело на %s:%d са грешком: %s\n"
+
+#: src/lib/util/crypto_ecc.c:554
+#, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "„ECC“ потписивање није успело на %s:%d: %s\n"
+
+#: src/lib/util/crypto_ecc.c:677
+#, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
+
+#: src/lib/util/crypto_ecc_setup.c:282
+msgid "Could not load peer's private key\n"
+msgstr "Не могу да учитам лични кључ парњака\n"
+
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "„libgcrypt“ није очекиваног издања (издање %s је потребно).\n"
+
+#: src/lib/util/crypto_rsa.c:908
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "„EdDSA“ потписивање није успело на %s:%d: %s\n"
+
+#: src/lib/util/crypto_rsa.c:1208
+#, fuzzy, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
+
+#: src/lib/util/disk.c:843
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "Очекивах да „%s“ буде директоријум!\n"
+
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Не могу да добијем податке о кориснику „%s“: %s\n"
+
+#: src/lib/util/dnsparser.c:910
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Нисам успео да претворим УТФ-8 назив „%s“ у ДНС ИДНА формат: %s\n"
+
+#: src/lib/util/dnsstub.c:228
+#, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Не могу да се вежем ни за један прикључник: %s\n"
+
+#: src/lib/util/dnsstub.c:371
+#, fuzzy, c-format
+msgid "Received DNS response that is too small (%u bytes)\n"
+msgstr "Примих ДНС одговор који је премали (%u бајта)"
+
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Нисам успео да пошаљем ДНС захтев за %s\n"
+
+#: src/lib/util/dnsstub.c:509
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Послао сам ДНС захтев за %s\n"
+
+#: src/lib/util/getopt.c:566
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: опција „%s“ је нејасна\n"
+
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
+
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
+
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
+
+#: src/lib/util/getopt.c:648
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: непрепозната опција „--%s“\n"
+
+#: src/lib/util/getopt.c:654
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: непрепозната опција „%c%s“\n"
+
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: недозвољена опција —— %c\n"
+
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: неисправна опција —— %c\n"
+
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: опција захтева аргумент —— %c\n"
+
+#: src/lib/util/getopt.c:762
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: опција „-W %s“ је нејасна\n"
+
+#: src/lib/util/getopt.c:782
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
+
+#: src/lib/util/getopt.c:971
+#, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "Употребите „%s“ да добавите списак опција.\n"
+
+#: src/lib/util/getopt.c:984
+#, fuzzy, c-format
+msgid "Option `%s' can't be used with other options.\n"
+msgstr "Опција „%s“ нема смисла без опције „%s“.\n"
+
+#: src/lib/util/getopt.c:996
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Недостаје опција „%s“ за радњу „%s“\n"
+
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Аргументи обавезни за дуге опције су такође обавезни за кратке опције.\n"
+
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:463
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "ствара јединствене датотеке подешавања"
+
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Морате да проследите број опцији „%s“.\n"
+
+#: src/lib/util/getopt_helpers.c:571
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Морате да проследите релативно време опцији „%s“.\n"
+
+#: src/lib/util/getopt_helpers.c:578
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:632
+#, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Морате да проследите релативно време опцији „%s“.\n"
+
+#: src/lib/util/getopt_helpers.c:686
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Морате да проследите релативно време опцији „%s“.\n"
+
+#: src/lib/util/getopt_helpers.c:743
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Морате да проследите број опцији „%s“.\n"
+
+#: src/lib/util/getopt_helpers.c:750
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:876
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Морате да проследите број опцији „%s“.\n"
+
+#: src/lib/util/getopt_helpers.c:954
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/lib/util/helper.c:304
+#, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Грешка читања из „%s“: %s\n"
+
+#: src/lib/util/helper.c:356
+#, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Нисам успео да обрадим долазну поруку са помоћника „%s“\n"
+
+#: src/lib/util/helper.c:571
+#, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Грешка писања у „%s“: %s\n"
+
+#: src/lib/util/network.c:163
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+"Не могу да скратим јуникс путању „%s“ док задржавам назив јединственим\n"
+
+#: src/lib/util/network.c:1284
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+"Кобна унутрашња логичка грешка, процес се заплео у „%s“ (прекините са КТРЛ-"
+"Ц)!\n"
+
+#: src/lib/util/os_installation.c:416
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+"Не могу да одредим путању инсталирања за „%s“.  Поставите „%s“ променљиву "
+"окружења.\n"
+
+#: src/lib/util/os_installation.c:787
+#, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Не могу да нађем извршну „%s“ у ПУТАЊИ!\n"
+
+#: src/lib/util/os_installation.c:820
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Покретање механизма прикључка није успело: %s!\n"
+
+#: src/lib/util/plugin.c:158
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
+
+#: src/lib/util/plugin.c:215
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "„%s“ није успело за библиотеку '%s' са грешком: %s\n"
+
+#: src/lib/util/plugin.c:371
+msgid "Could not determine plugin installation path.\n"
+msgstr "Не могу да одредим путању инсталирања прикључка.\n"
+
+#: src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "Лоше подешавање, излазим ...\n"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr "Лоша маска: %d\n"
+
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:243
+#, fuzzy, c-format
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
+msgstr ""
+"Морате навести „%s“ или бројевну ИП адресу за „%s“ од „%s“ у подешавањима!\n"
+
+#: src/lib/util/resolver_api.c:888
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Истекло је време при покушају решавања назива домаћина „%s“.\n"
+
+#: src/lib/util/resolver_api.c:901
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "Истекло је време при покушају решавања ИП адресе „%s“.\n"
+
+#: src/lib/util/resolver_api.c:1086
+#, fuzzy
+msgid "Resolver not configured correctly.\n"
+msgstr "Основна услуга „%s“ није подешена исправно!\n"
+
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Не могу да решим наш „FQDN“ : %s\n"
+
+#: src/lib/util/service.c:654
+#, fuzzy, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+"Обрађивачки код за поруку врсте %u није позвао „GNUNET_SERVER_receive_done“ "
+"након „%s“\n"
+
+#: src/lib/util/service.c:838
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr "Непозната породица адресе „%d“\n"
+
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr "Не могу да обрадим спецификацију ИПв4 мреже „%s“ за `%s:%s'\n"
+
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr "Не могу да обрадим спецификацију ИПв6 мреже „%s“ за `%s:%s'\n"
+
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr "Захтева исправан број прикључника за услугу „%s“ у подешавањима!\n"
+
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+"Искључујем подршку прикључнице ЈУНИКС домена за услугу „%s“, нисм успео да "
+"направим прикључницу ЈУНИКС домена: %s\n"
+
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+"Немам ни ПРИКЉУЧНИК ни ЈУНИКС_ПУТАЊУ за услугу „%s“, али је једно потребно\n"
+
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Нисам успео да решим „%s“: %s\n"
+
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Нисам успео да нађем %s адресу за „%s“.\n"
+
+#: src/lib/util/service.c:1401
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "„%s“ није успело за прикључник %d (%s).\n"
+
+#: src/lib/util/service.c:1413
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "„%s“ није успело за прикључник %d (%s): адреса је већ у употреби\n"
+
+#: src/lib/util/service.c:1420
+#, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "„%s“ није успело за „%s“: адреса је већ у употреби\n"
+
+#: src/lib/util/service.c:1481
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr "Наведена вредност за „%s“ услуге „%s“ је неисправна\n"
+
+#: src/lib/util/service.c:1505
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+"Не могу да приступим унапред свезаној прикључници %u, покушаћу да свежем "
+"себе самог\n"
+
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr "Нема таквог корисника"
+
+#: src/lib/util/service.c:1658
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Не могу да променим власника/групу на „%s“: %s\n"
+
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
+msgstr "Процес услуге није успео да се покрене\n"
+
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
+msgstr "Процес услуге не може да покрене функцију сервера\n"
+
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
+msgstr "Процес услуге није успео да извести о стању\n"
+
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr "ради демонизацију (откачиње од терминала)"
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
+#, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+msgid "Malformed configuration, exit ...\n"
+msgstr "Лоше подешавање, излазим ...\n"
+
+#: src/lib/util/socks.c:636
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/socks.c:653
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
+
+#: src/lib/util/strings.c:394
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr ""
+"Нисам успео да раширим „$HOME“: променљива окружења „HOME“ није постављена"
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr "ИПв6 адреса не почиње са [\n"
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr "ИПв6 адреса садржи : за раздвајање броја прикључника\n"
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr "ИПв6 адреса садржи ] пре : за раздвајање броја прикључника\n"
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr "ИПв6 адреса садржи исправан број прикључника након последње „:“\n"
+
+#: src/lib/util/strings.c:1081
+#, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Неисправна ИПв6 адреса „%s“: %s\n"
+
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr "Прикључник није у опсегу\n"
+
+#: src/lib/util/strings.c:1283
+#, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Лоша политика прикључника „%s“\n"
+
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Неисправан формат за ИП: „%s“\n"
+
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Неисправна напомена мреже („/%d“ није исправно у ИПв4 ЦИДР-у)."
+
+#: src/lib/util/strings.c:1459
+#, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Неисправан формат: „%s“\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Неисправна напомена мреже (не завршава се са „;“: „%s“)\n"
+
+#: src/lib/util/strings.c:1551
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Погрешан формат „%s“ за мрежну маску\n"
+
+#: src/lib/util/strings.c:1582
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Погрешан формат „%s“ за мрежу\n"
+
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/lib/util/time.c:937
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "Не могу да обрадим „MX“ запис „%s“\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Не могу да обрадим „GNS2DNS“ запис „%s“\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgstr "Нисам успео да серијализујем ГНС2ДНС запис са вредношћу „%s“\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Не могу да обрадим ниску ВПН записа „%s“\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Не могу да обрадим ниску ВПН записа „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "Нисам успео да серијализујем ЦНАЗИВ запис са вредношћу „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "Нисам успео да серијализујем УВЕР запис са %u бајта\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr ""
+"Нисам успео да серијализујем СОА запис са називом „%s“ и р-називом „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Нисам успео да серијализујем ПТР запис са вредношћу „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
+#, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Не могу да обрадим „MX“ запис „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
+#, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Нисам успео да серијализујем МИкс запис са називом домаћина „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Не могу да обрадим ИПв6 адресу „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "Не могу да покренем СКуЛајт: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Не могу да покренем СКуЛајт: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Нисам успео да прочитам датотеку"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+msgid "flat plugin running\n"
+msgstr ""
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Не могу да покренем СКуЛајт: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Нисам успео да покренем „%s“ на „%s“\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr "Покушај да затворим скулајт без довршавања свих спремљених изјава.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+msgid "Sqlite database running\n"
+msgstr "База података Скулајта ради\n"
+
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "База података шаблона ради\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Нисам успео да покренем „%s“ на „%s“\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+#, fuzzy
+msgid "SQlite database running\n"
+msgstr "База података Скулајта ради\n"
+
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Меш је покренут\n"
+
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Меш је покренут\n"
+
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+msgid "OpenID Connect REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+msgid "CONFIG REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:391
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+"Искључујем ИПв6 подршку за услугу „%s“, нисм успео да направим ИПв6 "
+"прикључницу: %s\n"
+
+#: src/service/arm/gnunet-service-arm.c:951
+#, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Нисам успео да покренем услугу „%s“\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr "Покрећем услугу „%s“\n"
+
+#: src/service/arm/gnunet-service-arm.c:1062
+#, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Не могу да направим прикључницу за услугу „%s“: %s\n"
+
+#: src/service/arm/gnunet-service-arm.c:1093
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+"Не могу да увежем прикључницу ослушкивања за услугу „%s“ на адресу „%s“: %s\n"
+
+#: src/service/arm/gnunet-service-arm.c:1124
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr "АУР сада надгледа везе ка услузи „%s“ на „%s“\n"
+
+#: src/service/arm/gnunet-service-arm.c:1272
+#, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Припремам се да зауставим „%s“\n"
+
+#: src/service/arm/gnunet-service-arm.c:1604
+#, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Поново покрећем услугу „%s“.\n"
+
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr "излази"
 
-#: src/core/gnunet-service-core.c:329
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr "сигнал"
+
+#: src/service/arm/gnunet-service-arm.c:1765
+msgid "unknown"
+msgstr "непознато"
+
+#: src/service/arm/gnunet-service-arm.c:1771
+#, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "Услуга „%s“ је узела %s да оконча\n"
+
+#: src/service/arm/gnunet-service-arm.c:1798
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr ""
+"Услуга „%s“ је окончана нормално, поново ће се покренути у било које време\n"
+
+#: src/service/arm/gnunet-service-arm.c:1815
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+"Услуга „%s“ је окончана са стањем %s/%d, поново ће се покренути за %s\n"
+
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr "Започињем гашење као што је затражио клијент.\n"
+
+#: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr "# захтеви слања су одбачени (веза је прекинута)"
 
-#: src/core/gnunet-service-core.c:355
+#: src/service/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/service/core/gnunet-service-core.c:419
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# бајтови порука врсте %u су примљени"
 
-#: src/core/gnunet-service-core.c:505
+#: src/service/core/gnunet-service-core.c:505
 msgid "# messages discarded (session disconnected)"
 msgstr "# поруке су одбачене (сесија је ископчана)"
 
-#: src/core/gnunet-service-core.c:824
+#: src/service/core/gnunet-service-core.c:824
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# бајтови порука врсте %u су примљени"
 
-#: src/core/gnunet-service-core.c:926
+#: src/service/core/gnunet-service-core.c:926
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Услузи језгра недостаје поставка подешавања КЉУЧА_ДОМАЋИНА.  Излазим.\n"
 
-#: src/core/gnunet-service-core.c:954
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Кључна услуга „%4s“ је спремна.\n"
 
-#: src/core/gnunet-service-core_kx.c:511
+#: src/service/core/gnunet-service-core_kx.c:511
 msgid "# bytes encrypted"
 msgstr "# бајтова шифрованих"
 
-#: src/core/gnunet-service-core_kx.c:569
+#: src/service/core/gnunet-service-core_kx.c:569
 msgid "# bytes decrypted"
 msgstr "# бајтова дешифрованих"
 
-#: src/core/gnunet-service-core_kx.c:666
+#: src/service/core/gnunet-service-core_kx.c:666
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# УТОВАР је одбачен (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:718
+#: src/service/core/gnunet-service-core_kx.c:718
 msgid "# key exchanges initiated"
 msgstr "# кључ измена је покренут"
 
-#: src/core/gnunet-service-core_kx.c:774
+#: src/service/core/gnunet-service-core_kx.c:774
 msgid "# key exchanges stopped"
 msgstr "# кључ измена је заустављен"
 
-#: src/core/gnunet-service-core_kx.c:806
+#: src/service/core/gnunet-service-core_kx.c:806
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# ПОНГ поруке су направљене"
 
-#: src/core/gnunet-service-core_kx.c:865
+#: src/service/core/gnunet-service-core_kx.c:865
 msgid "# old ephemeral keys ignored"
 msgstr "# стари једнократни кључеви су занемарени"
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/service/core/gnunet-service-core_kx.c:880
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# стари једнократни кључеви су занемарени"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/service/core/gnunet-service-core_kx.c:917
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# поруке ЈЕДНОКРАТНОГ_КЉУЧА су примљене"
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/service/core/gnunet-service-core_kx.c:936
 #, fuzzy, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
@@ -1177,294 +4553,203 @@ msgstr ""
 "Порука једнократног кључа од парњака „%s“ је одбачена јер њен опсег "
 "исправности не одговара времену нашег система (%llu није у [%llu,%llu]).\n"
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/service/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# поруке ЈЕДНОКРАТНОГ_КЉУЧА су примљене"
 
-#: src/core/gnunet-service-core_kx.c:962
+#: src/service/core/gnunet-service-core_kx.c:962
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# једнократни кључеви су примљени"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/service/core/gnunet-service-core_kx.c:1072
 msgid "# PING messages received"
 msgstr "# ПИНГ поруке су примљене"
 
-#: src/core/gnunet-service-core_kx.c:1082
+#: src/service/core/gnunet-service-core_kx.c:1082
 msgid "# PING messages dropped (out of order)"
 msgstr "# ПИНГ поруке су одбачене (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1134
+#: src/service/core/gnunet-service-core_kx.c:1134
 msgid "# PONG messages created"
 msgstr "# ПОНГ поруке су направљене"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/service/core/gnunet-service-core_kx.c:1159
 msgid "# sessions terminated by timeout"
 msgstr "# сесије су окончане временским истеком"
 
-#: src/core/gnunet-service-core_kx.c:1172
+#: src/service/core/gnunet-service-core_kx.c:1172
 msgid "# keepalive messages sent"
 msgstr "# поруке држања у животу су послате"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/service/core/gnunet-service-core_kx.c:1229
 msgid "# PONG messages received"
 msgstr "# ПОНГ поруке су примљене"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/service/core/gnunet-service-core_kx.c:1237
 msgid "# PONG messages dropped (connection down)"
 msgstr "# ПОНГ поруке су одбачене (веза је пала)"
 
-#: src/core/gnunet-service-core_kx.c:1246
+#: src/service/core/gnunet-service-core_kx.c:1246
 msgid "# PONG messages dropped (out of order)"
 msgstr "# ПОНГ поруке су одбачене (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/service/core/gnunet-service-core_kx.c:1288
 msgid "# PONG messages decrypted"
 msgstr "# ПОНГ поруке су дешифроване"
 
-#: src/core/gnunet-service-core_kx.c:1331
+#: src/service/core/gnunet-service-core_kx.c:1331
 msgid "# session keys confirmed via PONG"
 msgstr "# кључеви сесије су потврђени путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1343
+#: src/service/core/gnunet-service-core_kx.c:1343
 msgid "# timeouts prevented via PONG"
 msgstr "# временски истеци су спречени путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1352
+#: src/service/core/gnunet-service-core_kx.c:1352
 msgid "# rekey operations confirmed via PONG"
 msgstr "# операције рекључа су потврђене путем ПОНГ-а"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/service/core/gnunet-service-core_kx.c:1521
 msgid "# DATA message dropped (out of order)"
 msgstr "# ПОДАТАКА порука је одбачена (ван поретка)"
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 "Сесија за парњака „%s“ је пала услед истека кључа (није требало да се деси)\n"
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/service/core/gnunet-service-core_kx.c:1537
 msgid "# sessions terminated by key expiration"
 msgstr "# сесије су окончане истеком кључа"
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
 msgid "# bytes dropped (duplicates)"
 msgstr "# бајтови одбачени (удвострученост)"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/service/core/gnunet-service-core_kx.c:1632
 msgid "# bytes dropped (out of sequence)"
 msgstr "# бајтови одбачени (ван низа)"
 
-#: src/core/gnunet-service-core_kx.c:1679
+#: src/service/core/gnunet-service-core_kx.c:1679
 msgid "# bytes dropped (ancient message)"
 msgstr "# бајтови одбачени (стара порука)"
 
-#: src/core/gnunet-service-core_kx.c:1689
+#: src/service/core/gnunet-service-core_kx.c:1689
 msgid "# bytes of payload decrypted"
 msgstr "# бајтови утовара су дешифровани"
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
 msgid "# peers connected"
 msgstr "# парњаци су повезани"
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/service/core/gnunet-service-core_sessions.c:285
 msgid "# type map refreshes sent"
 msgstr "# освежавања мапе врсте су послата"
 
-#: src/core/gnunet-service-core_sessions.c:400
+#: src/service/core/gnunet-service-core_sessions.c:400
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "# мапе врсте су примљене"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/service/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "# мапе врсте су примљене"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr "# мапе врсте су примљене"
 
-#: src/core/gnunet-service-core_typemap.c:217
+#: src/service/core/gnunet-service-core_typemap.c:217
 msgid "# updates to my type map"
 msgstr "# ажурирања за моју мапу врсте"
 
-#: src/datacache/plugin_datacache_heap.c:492
+#: src/service/datacache/plugin_datacache_heap.c:492
 msgid "Heap datacache running\n"
 msgstr "Остава података скупине ради\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "„%s“ није успело на %s:%d са грешком: %s\n"
-
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr "Покушај да затворим скулајт без довршавања свих спремљених изјава.\n"
-
-#: src/datastore/datastore_api.c:340
+#: src/service/datastore/datastore_api.c:340
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "Прекинута је веза са"
 
-#: src/datastore/datastore_api.c:462
+#: src/service/datastore/datastore_api.c:462
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "Прекинута је веза са"
 
-#: src/datastore/datastore_api.c:565
+#: src/service/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr "# прекорачења реда"
 
-#: src/datastore/datastore_api.c:595
+#: src/service/datastore/datastore_api.c:595
 msgid "# queue entries created"
 msgstr "# уноси реда су створени"
 
-#: src/datastore/datastore_api.c:756
+#: src/service/datastore/datastore_api.c:756
 msgid "# status messages received"
 msgstr "# поруке стања су примљене"
 
-#: src/datastore/datastore_api.c:810
+#: src/service/datastore/datastore_api.c:810
 msgid "# Results received"
 msgstr "# Резултати су примљени"
 
-#: src/datastore/datastore_api.c:917
+#: src/service/datastore/datastore_api.c:917
 msgid "# datastore connections (re)created"
 msgstr "# везе смештаја података су (поново) створене"
 
-#: src/datastore/datastore_api.c:1007
+#: src/service/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr "# захтеви СТАВИ су извршени"
 
-#: src/datastore/datastore_api.c:1068
+#: src/service/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr "# захтеви РЕЗЕРВИШИ су извршени"
 
-#: src/datastore/datastore_api.c:1113
+#: src/service/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# захтеви ОТПУСТИ РЕЗЕРВИШИ су извршени"
 
-#: src/datastore/datastore_api.c:1171
+#: src/service/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr "# захтеви УКЛОНИ су извршени"
 
-#: src/datastore/datastore_api.c:1230
+#: src/service/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr "# захтеви ДОБАВИ ПРЕСЛИКАНОСТ су изршени"
 
-#: src/datastore/datastore_api.c:1276
+#: src/service/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# захтеви ДОБАВИ НУЛТУ АНОНИМНОСТ су извршени"
 
-#: src/datastore/datastore_api.c:1357
+#: src/service/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr "# захтеви ДОБАВИ су извршени"
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:257
-#, c-format
-msgid "Error queueing datastore GET operation\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
-#, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
-
-#: src/datastore/gnunet-datastore.c:319
-#, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "Нисам успео да сместим ставку: %s, прекидам\n"
-
-#: src/datastore/gnunet-datastore.c:331
-#, fuzzy, c-format
-msgid "Inserted %<PRIu64> records\n"
-msgstr "поставља A записе"
-
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:378
-#, c-format
-msgid "Error queueing datastore PUT operation\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "Нисам успео да се повежем са смештајем података."
-
-#: src/datastore/gnunet-datastore.c:454
-#, fuzzy, c-format
-msgid "Please choose at least one operation: %s, %s\n"
-msgstr "Изаберите једну радњу : „%s“ или „%s“ или „%s“ или „%s“ или „%s“\n"
-
-#: src/datastore/gnunet-datastore.c:477
-#, fuzzy
-msgid "Dump all records from the datastore"
-msgstr "Претражује запис за датим називом"
-
-#: src/datastore/gnunet-datastore.c:482
-#, fuzzy
-msgid "Insert records into the datastore"
-msgstr "# бајтови су послати смештају података"
-
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:498
-msgid "Manipulate GNUnet datastore"
-msgstr "Манипулише ГНУнет смештајом података"
-
-#: src/datastore/gnunet-service-datastore.c:335
+#: src/service/datastore/gnunet-service-datastore.c:335
 msgid "# bytes expired"
 msgstr "# бајтови су истекли"
 
-#: src/datastore/gnunet-service-datastore.c:419
+#: src/service/datastore/gnunet-service-datastore.c:419
 msgid "# bytes purged (low-priority)"
 msgstr "# бајтови су избачени (ниска хитност)"
 
-#: src/datastore/gnunet-service-datastore.c:551
+#: src/service/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr "# резултати су нађени"
 
-#: src/datastore/gnunet-service-datastore.c:593
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, fuzzy, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
@@ -1473,7 +4758,7 @@ msgstr ""
 "Недовољно простора (доступних бајтова %llu) за задовољавање „%s“ захтева за "
 "%llu бајта\n"
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1481,7 +4766,7 @@ msgid ""
 msgstr ""
 "Захтевана количина (%llu бајта) је већа од величине оставе (%llu бајта)\n"
 
-#: src/datastore/gnunet-service-datastore.c:612
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1489,178 +4774,170 @@ msgstr ""
 "Недовољно простора за задовољавање захтева а захтевана количина је већа од "
 "величине оставе"
 
-#: src/datastore/gnunet-service-datastore.c:619
+#: src/service/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr "Недовољно простора за задовољавање захтева"
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr "# је резервисано"
 
-#: src/datastore/gnunet-service-datastore.c:693
+#: src/service/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr "Не могу да нађем одговарајућу резервацију"
 
-#: src/datastore/gnunet-service-datastore.c:743
+#: src/service/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr "# бајтови су смештени"
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 "Потребна су још %llu бајта простора (%llu је дозвољено, користим %llu)\n"
 
-#: src/datastore/gnunet-service-datastore.c:858
+#: src/service/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr "# захтеви ДОБАВИ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/service/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# захтеви ДОБАВИ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:899
+#: src/service/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr "# захтеви су филтрирани блумфилтером"
 
-#: src/datastore/gnunet-service-datastore.c:940
+#: src/service/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr "# захтеви ДОБАВИ ПРЕСЛИКАНОСТ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:971
+#: src/service/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# захтеви ДОБАВИ НУЛТУ АНОНИМНОСТ су примљени"
 
-#: src/datastore/gnunet-service-datastore.c:1012
+#: src/service/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr "Нисам нашао садржај"
 
-#: src/datastore/gnunet-service-datastore.c:1019
+#: src/service/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr "# бајта је уклоњено (изричити захтев)"
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/service/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr "# захтеви УКЛОНИ су уклоњени"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, fuzzy, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 "Утовар смештаја података није тачан (%lld < %lld).  Покушавам да поправим.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Учитавам прикључак „%s“ смештаја података\n"
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/service/datastore/gnunet-service-datastore.c:1176
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Нисам успео да учитам прикључак смештаја података за „%s“\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/service/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr "Изградња блумфилтера је завршена.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/service/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Поново градим блумфилтер.  Будите стрпљиви.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/service/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "Прикључак не подржава функцију „get_keys“. Поправите то!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# бајтови су коришћени у смештају података дељења датотека „%s“"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/service/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr "# квота"
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/service/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr "# величина кеша"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr "Не могу да користим наведени назив датотеке „%s“ за блумфилтер.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Нисам успео да уклоним лажну датотеку блумфилтера „%s“\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/service/datastore/gnunet-service-datastore.c:1573
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Нисам успео да покренем блумфилтер.\n"
 
-#: src/datastore/plugin_datastore_heap.c:895
+#: src/service/datastore/plugin_datastore_heap.c:895
 msgid "Heap database running\n"
 msgstr "База података скупине ради\n"
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
+#: src/service/datastore/plugin_datastore_postgres.c:811
 msgid "Failed to drop table from database.\n"
 msgstr "Нисам успео да избацим табелу из базе података.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/service/datastore/plugin_datastore_sqlite.c:87
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "„%s“ није успело на %s:%u са грешком: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Не могу да покренем СКуЛајт: %s.\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:634
+#: src/service/datastore/plugin_datastore_sqlite.c:634
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
+#: src/service/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "Вредност је превелика.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr "скулајт издање је престаро за одређивање величине, подразумевам нулу\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
 #, fuzzy
 msgid "error preparing statement\n"
 msgstr "Нисам успео да припремим стање „%s“\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
 #, fuzzy
 msgid "error stepping\n"
 msgstr "„%s“ се зауставља"
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1669,412 +4946,309 @@ msgstr ""
 "Користим страницу коришћења скулајта да проценим утовар (%llu странице "
 "величине %llu бајта)\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-msgid "Sqlite database running\n"
-msgstr "База података Скулајта ради\n"
-
-#: src/datastore/plugin_datastore_template.c:252
+#: src/service/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr "База података шаблона ради\n"
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
-msgstr ""
-"Резултат %d, врста %d:\n"
-"%.*s\n"
-
-#: src/dht/gnunet-dht-get.c:167
-#, fuzzy, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-"Резултат %d, врста %d:\n"
-"%.*s\n"
-
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
-msgstr "Морате доставити кључ за ДХТ ДОБАВИ!\n"
-
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, c-format
-msgid "Failed to connect to DHT service!\n"
-msgstr "Нисам успео да се повежем са „DHT“ услугом!\n"
-
-#: src/dht/gnunet-dht-get.c:256
-#, fuzzy
-msgid "Issuing DHT GET with key"
-msgstr "Издајем ДХТ ДОБАВИ са кључем"
-
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
-msgstr "кључ упита"
-
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
-msgstr "колико паралелних захтева (реплика) да направи"
-
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-#, fuzzy
-msgid "use DHT's record route option"
-msgstr "користи опцију ДХТ-а демултиплексирај свуда"
-
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
-msgstr "врста података за тражење"
-
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr "колико дуго да извршава овај упит пре одустајања?"
-
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
-msgstr "користи опцију ДХТ-а демултиплексирај свуда"
-
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr "Издаје ДОБАВИ захтев ГНУнет ДХТ-у, исписује резултате."
-
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
-msgstr "колико дуго треба да ради наредба праћења"
-
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
-msgstr "бива опширан (исписује податке напредовања)"
-
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
-msgstr "Исписује све пакете који иду кроз „DHT“."
-
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr "Морате доставити КЉУЧ и ПОДАЦИ за ДХТ стављање!\n"
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Не могу да се повежем са „%s“ услугом!\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr "Издајем захтев стављања за „%s“ са подацима „%s“!\n"
-
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
-msgstr "подаци за уметање под кључем"
-
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr "колико ће дуго да држи овај унос у дхт-у (у секундама)"
-
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
-msgstr "број реплика за стварање"
-
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
-msgstr "врста за уметање података"
-
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr "Издаје захтев СТАВИ у ГНУнет ДХТ уметак ПОДАТАКА под КЉУЧЕМ."
-
-#: src/dht/gnunet_dht_profiler.c:925
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Излазим јер је број парњака %u\n"
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "број парњака у концензусу"
-
-#: src/dht/gnunet_dht_profiler.c:964
+#: src/service/dht/gnunet_dht_profiler.c:964
 #, fuzzy
 msgid "number of PUTs to perform per peer"
 msgstr "број битова за тражење доказивања о раду"
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
 msgid "name of the file with the login information for the testbed"
 msgstr "назив датотеке са подацима пријављивања за пробно место"
 
-#: src/dht/gnunet_dht_profiler.c:976
+#: src/service/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
+#: src/service/dht/gnunet_dht_profiler.c:982
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
+#: src/service/dht/gnunet_dht_profiler.c:988
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
+#: src/service/dht/gnunet_dht_profiler.c:993
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
+#: src/service/dht/gnunet_dht_profiler.c:999
 msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
+#: src/service/dht/gnunet_dht_profiler.c:1005
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
+#: src/service/dht/gnunet_dht_profiler.c:1026
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr "само надгледа ДНС упите"
 
-#: src/dns/gnunet-dns-monitor.c:387
+#: src/service/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr "Надгледа ДНС упите."
 
-#: src/dns/gnunet-dns-redirector.c:240
+#: src/service/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr "поставља A записе"
 
-#: src/dns/gnunet-dns-redirector.c:246
+#: src/service/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr "поставља AAAA записе"
 
-#: src/dns/gnunet-dns-redirector.c:259
+#: src/service/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr "Мења ДНС одговоре да показују негде другде."
 
-#: src/dns/gnunet-service-dns.c:463
+#: src/service/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr "# на ДНС захтеве је одговорено путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:617
+#: src/service/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# ДНС излаз није успео (нисам успео да отворим прикључницу)"
 
-#: src/dns/gnunet-service-dns.c:753
+#: src/service/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Спољни ДНС одговор је одбачен (нема одговарајућег захтева)"
 
-#: src/dns/gnunet-service-dns.c:829
+#: src/service/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr "# Одговор клијента је одбачен (нема одговарајућег захтева)"
 
-#: src/dns/gnunet-service-dns.c:951
+#: src/service/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Примих лош ИПв4-УДП пакет на ТУН сучељу.\n"
 
-#: src/dns/gnunet-service-dns.c:970
+#: src/service/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Примих лош ИПв6-УДП пакет на ТУН сучељу.\n"
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Добих не-ИП пакет са %u бајта и протокол %u са ТУН-а\n"
 
-#: src/dns/gnunet-service-dns.c:993
+#: src/service/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/service/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Не-ДНС УДП пакет је примљен путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:1066
+#: src/service/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr "# ДНС захтеви су примљени путем ТУН сучеља"
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "потребна је исправна ИПв4 или ИПв6 адреса\n"
 
-#: src/dns/gnunet-service-dns.c:1125
+#: src/service/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/service/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr "# ТЦП пакети су послати путем ТУН-а"
 
-#: src/exit/gnunet-daemon-exit.c:1074
+#: src/service/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr "# ICMP пакети су послати путем TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:1368
+#: src/service/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr "# UDP пакети су послати путем TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Бајтови су примљени од TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:1504
+#: src/service/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Захтеви УДП ИП-излаза су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/service/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Захтеви УДП услуге су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1658
+#: src/service/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Захтеви стварања ТЦП услуге су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1749
+#: src/service/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Захтеви стварања ТЦП ИП-излаза су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:1837
+#: src/service/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# TCP DATA захтеви су одбачени (нема сесије)"
 
-#: src/exit/gnunet-daemon-exit.c:1876
+#: src/service/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Захтеви ТЦП података су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:2017
+#: src/service/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Захтеви ИЦМП ИП-излаза су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# ICMPv4 пакети су одбачени (врста није дозвољена)"
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# ICMPv6 пакети су одбачени (врста није дозвољена)"
 
-#: src/exit/gnunet-daemon-exit.c:2287
+#: src/service/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Захтеви ИЦМП услуге су примљени путем меша"
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# ICMPv4 пакети су одбачени (немогуће PT за v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# ICMPv6 пакети су одбачени (немогуће PT за v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# Долазни МЕШ канали су створени"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/service/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr "Добих двоструке записе услуге за `%s:%u'\n"
 
-#: src/exit/gnunet-daemon-exit.c:2636
+#: src/service/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Бајтови су пренесени путем меш канала"
 
-#: src/exit/gnunet-daemon-exit.c:2828
+#: src/service/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# ICMP пакет је одбачен (није дозвољен)"
 
-#: src/exit/gnunet-daemon-exit.c:2837
+#: src/service/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "ICMP Пакет је одбачен, нема одговарајуће податке о вези\n"
 
-#: src/exit/gnunet-daemon-exit.c:2913
+#: src/service/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "UDP Пакет је одбачен, нема одговарајуће податке о вези\n"
 
-#: src/exit/gnunet-daemon-exit.c:2987
+#: src/service/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "TCP Пакет је одбачен, нема одговарајуће податке о вези\n"
 
-#: src/exit/gnunet-daemon-exit.c:3036
+#: src/service/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr "# Пакети су примљени од TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:3051
+#: src/service/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr "# Бајтови су примљени од TUN-а"
 
-#: src/exit/gnunet-daemon-exit.c:3078
+#: src/service/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Опције IPv4 пакета су примљене.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/service/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "IPv4 пакет са неподржаним следећим заглављем %u је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/service/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "IPv6 пакет са неподржаним следећим заглављем %d је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/service/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Пакет са непознатог протокола %u је примљен.  Занемарено.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Опција „%s“ за домен „%s“ није форматирана исправна!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr "„%s“ није исправан број прикључника (за домен „%s“)!"
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr "Није нађена ниједна адрееса за назив домаћина „%s“ услуге „%s“!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "Услуга „%s“ је подешена за IPv4, али IPv4 је искључено!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr "Није нађена ниједна ИП адрееса за назив домаћина „%s“ услуге „%s“!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/service/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2082,7 +5256,7 @@ msgstr ""
 "Овај систем не подржава IPv4, искључиће IPv4 функције упркос томе што су "
 "укључене у подешавањима\n"
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2090,7 +5264,7 @@ msgstr ""
 "Овај систем не подржава IPv6, искључиће IPv6 функције упркос томе што су "
 "укључене у подешавањима\n"
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/service/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2098,7 +5272,7 @@ msgstr ""
 "Не могу да укључим ИПв4 излаз али искључујем ИПв4 на ТУН сучељу, користићу "
 "„ENABLE_IPv4=ДА“\n"
 
-#: src/exit/gnunet-daemon-exit.c:3661
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2106,97 +5280,99 @@ msgstr ""
 "Не могу да укључим ИПв6 излаз али искључујем ИПв6 на ТУН сучељу, користићу "
 "„ENABLE_IPv6=ДА“\n"
 
-#: src/exit/gnunet-daemon-exit.c:3832
+#: src/service/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr "Мора бити број"
 
-#: src/exit/gnunet-daemon-exit.c:3948
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ниједна корисна услуга није укључена.  Излазим.\n"
 
-#: src/exit/gnunet-daemon-exit.c:4114
+#: src/service/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Демон за покретање за обезбеђивање чвора ИП излаза за ВПН"
 
-#: src/fs/fs_api.c:481
+#: src/service/fs/fs_api.c:481
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Не могу да отворим датотеку „%s“: %s"
 
-#: src/fs/fs_api.c:492
+#: src/service/fs/fs_api.c:492
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Не могу да читам датотеку „%s“: %s"
 
-#: src/fs/fs_api.c:500
+#: src/service/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "Кратко читање читајући из датотеке „%s“!"
 
-#: src/fs/fs_api.c:1157
+#: src/service/fs/fs_api.c:1157
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Нисам успео да наставим са подацима објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:1708
+#: src/service/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:1723
+#: src/service/fs/fs_api.c:1723
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Нисам успео да наставим са радњом објављивања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2452
+#: src/service/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Неуспех приликом настављања са радњом поништавања индексирања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2463
+#: src/service/fs/fs_api.c:2463
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Нисам успео да наставим са радњом поништавања индексирања „%s“: %s\n"
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Нисам успео да наставим са садржаним преузимањем „%s“: %s\n"
 
-#: src/fs/fs_api.c:2629
+#: src/service/fs/fs_api.c:2629
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Нисам успео да наставим са садржаном претрагом „%s“: %s\n"
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr "Неуспех приликом настављања са радњом претраге „%s“: %s\n"
 
-#: src/fs/fs_api.c:2847
+#: src/service/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Нисам успео да наставим са садржаним преузимањем „%s“: не могу да отворим "
 "датотеку „%s“\n"
 
-#: src/fs/fs_api.c:3108
+#: src/service/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "Не могу да наставим са покренутом претрагом, наставићу као са паузираном "
 "претрагом\n"
 
-#: src/fs/fs_directory.c:216
+#: src/service/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "МАГИЈА не одговара.  Ово није директоријум ГНУнет-а.\n"
 
-#: src/fs/fs_download.c:311
+#: src/service/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2204,27 +5380,27 @@ msgstr ""
 "Дубинска преузимања директоријума већих од 4 GB нису подржана на 32-битним "
 "системима\n"
 
-#: src/fs/fs_download.c:333
+#: src/service/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr "Директоријум је превелик за простор адресу система\n"
 
-#: src/fs/fs_download.c:347
+#: src/service/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Нисам успео да направим директоријум за дубинско преузимање „%s“\n"
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Нисам успео да отворим датотеку „%s“ за писање"
 
-#: src/fs/fs_download.c:961
+#: src/service/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Нисам успео да направим директоријум за дубинско преузимање „%s“\n"
 
-#: src/fs/fs_download.c:1045
+#: src/service/fs/fs_download.c:1045
 #, fuzzy, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
@@ -2233,35 +5409,35 @@ msgstr ""
 "Унутрашња грешка или лажна путања преузимања (очекивах %u бајта на дубини %u "
 "и померају %llu/%llu, добих %u бајта)"
 
-#: src/fs/fs_download.c:1067
+#: src/service/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr "унутрашња грешка дешифровања садржаја"
 
-#: src/fs/fs_download.c:1090
+#: src/service/fs/fs_download.c:1090
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Преузимање није успело: не могу да отворим датотеку „%s“: %s"
 
-#: src/fs/fs_download.c:1101
+#: src/service/fs/fs_download.c:1101
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Нисам успео да пређем на померај %llu у датотеци „%s“: %s"
 
-#: src/fs/fs_download.c:1111
+#: src/service/fs/fs_download.c:1111
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Нисам успео да запишем блок од %u бајта на померају %llu у датотеци „%s“: %s"
 
-#: src/fs/fs_download.c:1219
+#: src/service/fs/fs_download.c:1219
 msgid "internal error decoding tree"
 msgstr "унутрашња грешка декодирања стабла"
 
-#: src/fs/fs_download.c:1890
+#: src/service/fs/fs_download.c:1890
 msgid "Invalid URI"
 msgstr "Неисправан УРИ"
 
-#: src/fs/fs_getopt.c:237
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2270,962 +5446,460 @@ msgstr ""
 "Непозната врста метаподатака у опцији метаподатака „%s“.  Користим уместо "
 "тога користим врсту метаподатака `unknown'.\n"
 
-#: src/fs/fs_list_indexed.c:191
+#: src/service/fs/fs_list_indexed.c:191
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Нисам успео да се не повежем са „%s“ услугом.\n"
 
-#: src/fs/fs_misc.c:129
+#: src/service/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Нисам успео да нађем миме врсту „%s“ на списку проширења.\n"
 
-#: src/fs/fs_namespace.c:203
+#: src/service/fs/fs_namespace.c:203
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Нисам успео да отворим „%s“ ради уписа: %s\n"
 
-#: src/fs/fs_namespace.c:234
+#: src/service/fs/fs_namespace.c:234
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Нисам успео да пишем „%s“: %s\n"
 
-#: src/fs/fs_namespace.c:331
+#: src/service/fs/fs_namespace.c:331
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Нисам успео да прочитам „%s“: %s\n"
 
-#: src/fs/fs_namespace.c:458
+#: src/service/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr "Нисам успео да се повежем са смештајем података."
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Објављивање није успело: %s"
 
-#: src/fs/fs_publish.c:732
+#: src/service/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Не могу да отворим датотеку кључа домаћина „%s“: %s\n"
 
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Не могу да индексирам датотеку „%s“: %s.  Покушаћу да је уметнем.\n"
 
-#: src/fs/fs_publish.c:791
+#: src/service/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "истекло је време на захтев почетка индекса за „fs“ услугу"
 
-#: src/fs/fs_publish.c:837
+#: src/service/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr "нисам успео да прорачунам хеш"
 
-#: src/fs/fs_publish.c:857
+#: src/service/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr "назив датотеке је предуг"
 
-#: src/fs/fs_publish.c:889
+#: src/service/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr "не могу да се повежем са „fs“ услугом"
 
-#: src/fs/fs_publish.c:915
+#: src/service/fs/fs_publish.c:915
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Нисам успео да добавим одреднике датотеке за „%s“\n"
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/service/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "Дубински утовар није успео на „%s“: %s"
 
-#: src/fs/fs_publish.c:1116
+#: src/service/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Дубински утовар није успео: %s"
 
-#: src/fs/fs_publish.c:1157
+#: src/service/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr "треба да буде актуелна датотека"
 
-#: src/fs/fs_publish.c:1397
+#: src/service/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "# Неуспеси „СТАВИ“ смештаја података"
 
-#: src/fs/fs_publish.c:1489
+#: src/service/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Резервишем простор за %u уноса и %llu бајта за објављивање\n"
 
-#: src/fs/fs_publish_ksk.c:213
+#: src/service/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr "Не могу да се повежем са смештајем података."
 
-#: src/fs/fs_publish_ublock.c:215
+#: src/service/fs/fs_publish_ublock.c:215
 msgid "Internal error."
 msgstr "Унутрашња грешка."
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Нисам успео да обрадим УРИ „%s“: %s\n"
 
-#: src/fs/fs_search.c:994
+#: src/service/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr "Добих резултат са непознатом врстом блока „%d“, занемарујем"
 
-#: src/fs/fs_unindex.c:64
+#: src/service/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr "Нисам успео да нађем дати положај у датотеци"
 
-#: src/fs/fs_unindex.c:69
+#: src/service/fs/fs_unindex.c:69
 msgid "Failed to read file"
 msgstr "Нисам успео да прочитам датотеку"
 
-#: src/fs/fs_unindex.c:276
+#: src/service/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
 
-#: src/fs/fs_unindex.c:327
+#: src/service/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Нисам успео да се повежем на ФС услугу зарад поништавања индексирања."
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
 msgid "Failed to get KSKs from directory scan."
 msgstr "Нисам успео да добавим KSKs из скенирања директоријума."
 
-#: src/fs/fs_unindex.c:386
+#: src/service/fs/fs_unindex.c:386
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Унутрашња грешка скенирања „%s“.\n"
 
-#: src/fs/fs_unindex.c:447
+#: src/service/fs/fs_unindex.c:447
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Нисам успео да уклоним „UBlock“: %s\n"
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
 msgid "Failed to connect to `datastore' service."
 msgstr "Нисам успео да се повежем са „datastore“ услугом."
 
-#: src/fs/fs_unindex.c:670
+#: src/service/fs/fs_unindex.c:670
 msgid "Failed to open file for unindexing."
 msgstr "Нисам успео да отворим датотеку за поништавање индексирања."
 
-#: src/fs/fs_unindex.c:709
+#: src/service/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr "Нисам успео да израчунам хеш датотеке."
 
-#: src/fs/fs_uri.c:232
+#: src/service/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "„%“ мора бити праћено HEX бројем"
 
-#: src/fs/fs_uri.c:291
+#: src/service/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:309
+#: src/service/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:316
+#: src/service/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Лоша KSK УРИ (не сме почињати или завршавати се са знаком +)"
 
-#: src/fs/fs_uri.c:383
+#: src/service/fs/fs_uri.c:383
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "Лоша SKS УРИ"
 
-#: src/fs/fs_uri.c:424
+#: src/service/fs/fs_uri.c:424
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "Лоша CHK УРИ"
 
-#: src/fs/fs_uri.c:441
+#: src/service/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
+#: src/service/fs/fs_uri.c:518
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:535
+#: src/service/fs/fs_uri.c:535
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:545
+#: src/service/fs/fs_uri.c:545
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "LOC УРИ је лоше"
 
-#: src/fs/fs_uri.c:553
+#: src/service/fs/fs_uri.c:553
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "LOC УРИ је лоше (не могу да декодирам јавни кључ)"
 
-#: src/fs/fs_uri.c:562
+#: src/service/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "LOC УРИ је лоше (не могу да декодирам јавни кључ)"
 
-#: src/fs/fs_uri.c:568
+#: src/service/fs/fs_uri.c:568
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "SKS УРИ је лоше (не могу да нашем потпис)"
 
-#: src/fs/fs_uri.c:575
+#: src/service/fs/fs_uri.c:575
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "SKS УРИ је лоше (не могу да нашем потпис)"
 
-#: src/fs/fs_uri.c:586
+#: src/service/fs/fs_uri.c:586
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "SKS УРИ је лоше (не могу да декодирам потпис)"
 
-#: src/fs/fs_uri.c:593
+#: src/service/fs/fs_uri.c:593
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "SKS УРИ је лоше (не могу да обрадим време истека)"
 
-#: src/fs/fs_uri.c:599
+#: src/service/fs/fs_uri.c:599
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "SKS УРИ је лоше (не могу да обрадим време истека)"
 
-#: src/fs/fs_uri.c:613
+#: src/service/fs/fs_uri.c:613
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "SKS УРИ је лоше (потврђивање потписа није успело)"
 
-#: src/fs/fs_uri.c:646
+#: src/service/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/fs/fs_uri.c:666
+#: src/service/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr "Непозната УРИ врста"
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Нису наведене речи кључа!\n"
 
-#: src/fs/fs_uri.c:1094
+#: src/service/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Број двоструких квота које нису уравнотежене!\n"
 
-#: src/fs/gnunet-auto-share.c:234
-#, c-format
-msgid "Failed to load state: %s\n"
-msgstr "Нисам успео да учитам стање: %s\n"
-
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
-#, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "Нисам успео да сачувам стање у датотеку „%s“\n"
-
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr "Објављивање „%s“ је готово\n"
-
-#: src/fs/gnunet-auto-share.c:480
-#, c-format
-msgid "Publishing `%s'\n"
-msgstr "Објављујем „%s“\n"
-
-#: src/fs/gnunet-auto-share.c:491
-#, c-format
-msgid "Failed to run `%s'\n"
-msgstr "Нисам успео да покренем „%s“\n"
-
-#: src/fs/gnunet-auto-share.c:661
-#, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
-msgstr ""
-"Морате навести један и само један назив директоријума за самостално "
-"објављивање.\n"
-
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "поставља жељени НИВО анонимности пошиљаоца"
-
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr "искључује додавање времена стварања метаподацима утоварене датотеке"
-
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
-msgstr "не користи „libextractor“ за додавање кључних речи или метаподатака"
-
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
-msgstr "наводи приоритет садржаја"
-
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
-msgstr "поставља жељени НИВО одоговарања"
-
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
-msgstr "Самостално објављује датотеке из директоријума на ГНУнет-у"
-
-#: src/fs/gnunet-daemon-fsprofiler.c:668
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Демон за коришћење дељења датотеке за мерење њене учинковитости."
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
-msgstr "\t<изворна датотека угнеждена у %u бајта метаподатака>\n"
-
-#: src/fs/gnunet-directory.c:106
-#, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "Метаподаци директоријума „%s“:\n"
-
-#: src/fs/gnunet-directory.c:109
-#, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "Садржај директоријума „%s“:\n"
-
-#: src/fs/gnunet-directory.c:146
-msgid "You must specify a filename to inspect.\n"
-msgstr "Морате навести назив датотеке за преглед.\n"
-
-#: src/fs/gnunet-directory.c:160
-#, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Нисам успео да прочитам директоријум „%s“\n"
-
-#: src/fs/gnunet-directory.c:170
-#, c-format
-msgid "`%s' is not a GNUnet directory\n"
-msgstr "„%s“ није ГНУнет директоријум\n"
-
-#: src/fs/gnunet-directory.c:201
-msgid "Display contents of a GNUnet directory"
-msgstr "Приказује садржај ГНУнет директоријума"
-
-#: src/fs/gnunet-download.c:131
-#, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Покрећем преузимање „%s“.\n"
-
-#: src/fs/gnunet-download.c:143
-msgid "<unknown time>"
-msgstr "<непознато време>"
-
-#: src/fs/gnunet-download.c:155
-#, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
-msgstr ""
-"Преузимам „%s“ при %llu/%llu (преостаје %s, %s/сек). Блоку је требало %s за "
-"преузимање\n"
-
-#: src/fs/gnunet-download.c:177
-#, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Грешка преузимања: %s.\n"
-
-#: src/fs/gnunet-download.c:189
-#, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Преузимање „%s“ је готово (%s/сек).\n"
-
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr "Неочекивано стање: %d\n"
-
-#: src/fs/gnunet-download.c:234
-msgid "You need to specify a URI argument.\n"
-msgstr "Треба да наведете УРИ аргумент.\n"
-
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
-#, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Нисам успео да обрадим УРИ: %s\n"
-
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
-msgstr "Подржани су само CHK или LOC УРИ.\n"
-
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
-msgstr "Назив циљне датотеке мора бити наведен.\n"
-
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Не могу да покренем „%s“ субсистем.\n"
-
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "поставља жељени НИВО анонимности примаоца"
-
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr "брише недовршена преузимања (када се прекине са КТРЛ-Ц)"
-
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
-msgstr "тражи само локалног парњака (без претраге П2П мреже)"
-
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
-msgstr "уписује датотеку у НАЗИВ_ДАТОТЕКЕ"
-
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr "поставља највећи број паралелних преузимања који је дозвољен"
-
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr "поставља највећи број паралелних захтева за блокове који је дозвољен"
-
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
-msgstr "преузима ГНУнет директоријум дубински"
-
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-"Преузима датотеке са ГНУнет-а користећи ГНУнет CHK или LOC УРИ (gnunet://fs/"
-"chk/...)"
-
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/service/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "одрађује експеримент са БРОЈ парњака"
 
-#: src/fs/gnunet-fs-profiler.c:218
+#: src/service/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr "наводи назив датотеке са ДОМАЋИНИМА коју пробно место треба да користи"
 
-#: src/fs/gnunet-fs-profiler.c:225
+#: src/service/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr "самостално окончава експеримент након ЗАСТОЈА"
 
-#: src/fs/gnunet-fs-profiler.c:237
+#: src/service/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr "покреће пробно место за мерење учинковитости дељења датотека"
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr "исписује списак свих индексираних датотека"
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr "Посебне радње дељења датотека"
-
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr "Објављујем „%s“ при %llu/%llu (преостаје %s)\n"
-
-#: src/fs/gnunet-publish.c:247
-#, c-format
-msgid "Error publishing: %s.\n"
-msgstr "Грешка објављивања: %s.\n"
-
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr "Објављивање „%s“ је готово.\n"
-
-#: src/fs/gnunet-publish.c:259
-#, c-format
-msgid "URI is `%s'.\n"
-msgstr "УРИ је „%s“.\n"
-
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr "УРИ је „%s“.\n"
-
-#: src/fs/gnunet-publish.c:280
-#, fuzzy
-msgid "Starting cleanup after abort\n"
-msgstr "Чисти након обављеног прекидања.\n"
-
-#: src/fs/gnunet-publish.c:287
-#, fuzzy
-msgid "Cleanup after abort completed.\n"
-msgstr "Чисти након обављеног прекидања.\n"
-
-#: src/fs/gnunet-publish.c:292
-#, fuzzy
-msgid "Cleanup after abort failed.\n"
-msgstr "Чисти након обављеног прекидања.\n"
-
-#: src/fs/gnunet-publish.c:426
-#, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "Мета подаци за датотеку „%s“ (%s)\n"
-
-#: src/fs/gnunet-publish.c:428
-#, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "Кључне речи за датотеку „%s“ (%s)\n"
-
-#: src/fs/gnunet-publish.c:583
-msgid "Could not publish\n"
-msgstr "Не могу да објавим\n"
-
-#: src/fs/gnunet-publish.c:612
-msgid "Could not start publishing.\n"
-msgstr "Не могу да покренем објављивање.\n"
-
-#: src/fs/gnunet-publish.c:645
-#, c-format
-msgid "Scanning directory `%s'.\n"
-msgstr "Скенирам директоријум „%s“.\n"
-
-#: src/fs/gnunet-publish.c:647
-#, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "Скенирам датотеку „%s“.\n"
-
-#: src/fs/gnunet-publish.c:653
-#, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
-msgstr "Било је проблема обраде датотеке „%s“, прескачем је.\n"
-
-#: src/fs/gnunet-publish.c:659
-msgid "Preprocessing complete.\n"
-msgstr "Предодбрада је завршена.\n"
-
-#: src/fs/gnunet-publish.c:665
-#, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
-msgstr "Извлачење мета података из датотеке „%s“ је завршено.\n"
-
-#: src/fs/gnunet-publish.c:671
-msgid "Meta data extraction has finished.\n"
-msgstr "Извлачење мета података је завршено.\n"
-
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "Унутрашња грешка скенирања директоријума.\n"
-
-#: src/fs/gnunet-publish.c:706
-#, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr "Изабрани псеудоним „%s“ је непознат\n"
-
-#: src/fs/gnunet-publish.c:738
-#, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Нисам успео да приступим „%s“: %s\n"
-
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-"Нисам успео да покренем скенер мета директоријума.  Да ли је инсталиран "
-"„gnunet-helper-publish-fs“?\n"
-
-#: src/fs/gnunet-publish.c:811
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr "Не могу да извучем метаподатке из УРИ-ја!\n"
-
-#: src/fs/gnunet-publish.c:818
-#, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr "Морате навести један и само један назив датотеке за уметање.\n"
-
-#: src/fs/gnunet-publish.c:824
-#, c-format
-msgid "You must NOT specify an URI and a filename.\n"
-msgstr "НЕ можете навести УРИ и назив датотеке.\n"
-
-#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
-#, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
-msgstr "Опција „%s“ се захтева приликом коришћења опције „%s“.\n"
-
-#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
-msgstr "Опција „%s“ нема смисла без опције „%s“.\n"
-
-#: src/fs/gnunet-publish.c:907
-#, fuzzy
-msgid "enable adding the creation time to the metadata of the uploaded file"
-msgstr "искључује додавање времена стварања метаподацима утоварене датотеке"
-
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-"исписује списак извучених кључних речи које ће се користити, али не обавља "
-"утовар"
-
-#: src/fs/gnunet-publish.c:921
-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:928
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "поставља мета-податке за дату ВРСТУ за дату ВРЕДНОСТ"
-
-#: src/fs/gnunet-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-"не индексира, обавља пуно уметање (смешта читаву датотеку у шифрованом "
-"облику у ГНУнет базу података)"
-
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
-"наводи ИБ ажурираног издања које ће бити објављено у будућности (само за "
-"уметања називног простора)"
-
-#: src/fs/gnunet-publish.c:953
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr ""
-"објављује датотеке под псеудонимом НАЗИВ (ставља датотеку у називни простор)"
-
-#: src/fs/gnunet-publish.c:965
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
-msgstr ""
-"само опонаша процес али не чини никакво актуелно објављивање (корисно за "
-"прорачун УРИ-ја)"
-
-#: src/fs/gnunet-publish.c:972
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
-msgstr ""
-"поставља ИБ овог издања објављивања (само за уметања називног простора)"
-
-#: src/fs/gnunet-publish.c:980
-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:998
-msgid "Publish a file or directory on GNUnet"
-msgstr "Објављује датотеку или директоријум на ГНУнет-у"
-
-#: src/fs/gnunet-search.c:446
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr "Нисам успео да пишем директоријум са резултатима претраге за „%s“\n"
-
-#: src/fs/gnunet-search.c:535
-#, c-format
-msgid "Error searching: %s.\n"
-msgstr "Грешка претраге: %s.\n"
-
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:602
-#, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:608
-#, c-format
-msgid "An output file is mandatory for silent mode.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:629
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Не могу да створим УРИ кључне речи из аргумената.\n"
-
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:662
-#, fuzzy, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
-msgstr "Не могу да покренем „%s“ субсистем.\n"
-
-#: src/fs/gnunet-search.c:676
-msgid "Could not start searching.\n"
-msgstr "Не могу да покренем претрагу.\n"
-
-#: src/fs/gnunet-search.c:702
-#, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
-msgstr "поставља жељени НИВО анонимности примаоца"
-
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
-msgstr ""
-
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:733
-msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
-msgstr ""
-
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
-msgstr "самостално окончава претрагу након што су пронађени резултати ВРЕДНОСТ"
-
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
-msgstr ""
-
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
-msgstr ""
-
-#: src/fs/gnunet-search.c:776
-#, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-#, fuzzy
-msgid "Search for files that have been published on GNUnet\n"
-msgstr "Претражује ГНУнет за датотекама које су објављене на ГНУнет-у"
-
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
 msgid "# client searches active"
 msgstr "# претраге клијента су активне"
 
-#: src/fs/gnunet-service-fs.c:423
+#: src/service/fs/gnunet-service-fs.c:423
 msgid "# replies received for local clients"
 msgstr "# одговори су примљени за локалне клијенте"
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
 msgid "# Loopback routes suppressed"
 msgstr "# Руте петље су потиснуте"
 
-#: src/fs/gnunet-service-fs.c:785
+#: src/service/fs/gnunet-service-fs.c:785
 msgid "# client searches received"
 msgstr "# претраге клијента су примљене"
 
-#: src/fs/gnunet-service-fs.c:825
+#: src/service/fs/gnunet-service-fs.c:825
 msgid "# client searches updated (merged content seen list)"
 msgstr "# претраге клијента су освежене (стопљени садржај виђеног списка)"
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/service/fs/gnunet-service-fs.c:995
 #, fuzzy, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 "Неодговарајући хеш приликом покушаја индексирања датотеке „%s“ која има хеш "
 "„%s“\n"
 
-#: src/fs/gnunet-service-fs.c:1237
+#: src/service/fs/gnunet-service-fs.c:1237
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Услузи језгра недостаје поставка подешавања КЉУЧА_ДОМАЋИНА.  Излазим.\n"
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Нисам успео да се повежем са „%s“ услугом.\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# одговори су примљени путем меша"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# одговори су примљени путем одбаченог меша"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# упити су примљени путем неодговореног меша"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# Блокови су пренесени путем меша"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# упути су примљени путем меша"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# везе меш клијента су одбијене"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# меш везе су радне"
 
-#: src/fs/gnunet-service-fs_cp.c:539
+#: src/service/fs/gnunet-service-fs_cp.c:539
 msgid "# migration stop messages received"
 msgstr "# поруке заустављања миграције су примљене"
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Премештање садржаја за парњака „%s“ је блокирано за %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
 msgid "# P2P searches active"
 msgstr "# П2П претраге су активне"
 
-#: src/fs/gnunet-service-fs_cp.c:671
+#: src/service/fs/gnunet-service-fs_cp.c:671
 msgid "# artificial delays introduced (ms)"
 msgstr "# вештачка кашњења су уведена (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:868
+#: src/service/fs/gnunet-service-fs_cp.c:868
 msgid "# requests done for free (low load)"
 msgstr "# захтева је готово за џабе (слабо учитавање)"
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/service/fs/gnunet-service-fs_cp.c:893
 msgid "# request dropped, priority insufficient"
 msgstr "# захтева је одбачено, недовољно хитности"
 
-#: src/fs/gnunet-service-fs_cp.c:903
+#: src/service/fs/gnunet-service-fs_cp.c:903
 msgid "# requests done for a price (normal load)"
 msgstr "# захтева је готово за цену (нормално учитавање)"
 
-#: src/fs/gnunet-service-fs_cp.c:1000
+#: src/service/fs/gnunet-service-fs_cp.c:1000
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# захтеви су одбачени услед вишег-ТТЛ захтева"
 
-#: src/fs/gnunet-service-fs_cp.c:1058
+#: src/service/fs/gnunet-service-fs_cp.c:1058
 msgid "# GET requests received (from other peers)"
 msgstr "# „GET“ захтеви су примљени (од других парњака)"
 
-#: src/fs/gnunet-service-fs_cp.c:1082
+#: src/service/fs/gnunet-service-fs_cp.c:1082
 msgid "# requests dropped due to missing reverse route"
 msgstr "# захтеви су одбачени јер недостаје повратна рута"
 
-#: src/fs/gnunet-service-fs_cp.c:1096
+#: src/service/fs/gnunet-service-fs_cp.c:1096
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# П2П поруке су одбачене због пуног реда"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/service/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests dropped due TTL underflow"
 msgstr "# захтеви су одбачени услед ниског ТТЛ тока"
 
-#: src/fs/gnunet-service-fs_cp.c:1197
+#: src/service/fs/gnunet-service-fs_cp.c:1197
 msgid "# P2P query messages received and processed"
 msgstr "# поруке П2П упита су примљене и обрађене"
 
-#: src/fs/gnunet-service-fs_cp.c:1541
+#: src/service/fs/gnunet-service-fs_cp.c:1541
 msgid "# migration stop messages sent"
 msgstr "# поруке зауставља миграције су послате"
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Не могу да отворим „%s“.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/service/fs/gnunet-service-fs_indexing.c:146
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Грешка писања „%s“.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/service/fs/gnunet-service-fs_indexing.c:243
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Нисам успео да обришем лажни блок: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:296
+#: src/service/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# блокови индекси су уклоњени: изворна датотека је неприступачна"
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "Не могу да приступим индексираној датотеци „%s“ (%s) на померају %llu: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/service/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr "није индексирано"
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/service/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Индексирана датотека „%s“ је измењена на померају %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3234,854 +5908,444 @@ msgstr ""
 "Примљени захтев индексирања за датотеку „%s“ је већ индексиран „%s“.  Ипак "
 "одобравам.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:260
+#: src/service/fs/gnunet-service-fs_pe.c:260
 msgid "# average retransmission delay (ms)"
 msgstr "# просечан застој поновног преноса (ms)"
 
-#: src/fs/gnunet-service-fs_pe.c:422
+#: src/service/fs/gnunet-service-fs_pe.c:422
 msgid "# delay heap timeout (ms)"
 msgstr "# истекло је време застоја скупине (ms)"
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/service/fs/gnunet-service-fs_pe.c:433
 msgid "# query plans executed"
 msgstr "# план упита је извршен"
 
-#: src/fs/gnunet-service-fs_pe.c:462
+#: src/service/fs/gnunet-service-fs_pe.c:462
 msgid "# query messages sent to other peers"
 msgstr "# поруке упита су послате другим парњацима"
 
-#: src/fs/gnunet-service-fs_pe.c:530
+#: src/service/fs/gnunet-service-fs_pe.c:530
 msgid "# requests merged"
 msgstr "# захтеви су стопљени"
 
-#: src/fs/gnunet-service-fs_pe.c:540
+#: src/service/fs/gnunet-service-fs_pe.c:540
 msgid "# requests refreshed"
 msgstr "# захтеви су освежени"
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr "# пропитује обичне уносе"
 
-#: src/fs/gnunet-service-fs_pr.c:305
+#: src/service/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr "# Захтеви на чекању су створени"
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr "# Захтеви на чекању су активни"
 
-#: src/fs/gnunet-service-fs_pr.c:795
+#: src/service/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr "# одговори су примљени и подударени"
 
-#: src/fs/gnunet-service-fs_pr.c:869
+#: src/service/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr "# резултати су пронађени локално"
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/service/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr "# Неуспеси „СТАВИ“ смештаја података"
 
-#: src/fs/gnunet-service-fs_pr.c:1032
+#: src/service/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr "# захтеви смештаја су одбачени услед високог утовара"
 
-#: src/fs/gnunet-service-fs_pr.c:1073
+#: src/service/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr "# Одговори су примљени од DHT-а"
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/service/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# Одговори су примљени од DHT-а"
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "Претрага смештаја података је већ узела „%s“!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "Претрага на-захтев је већ узела „%s“!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/service/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# захтевани DBLOCK или IBLOCK нису нађени"
 
-#: src/fs/gnunet-service-fs_pr.c:1433
+#: src/service/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Претраге смештаја података су закључене (грешка стављања у ред)"
 
-#: src/fs/gnunet-service-fs_pr.c:1488
+#: src/service/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Претраге смештаја података су закључене (нема резултата)"
 
-#: src/fs/gnunet-service-fs_pr.c:1503
+#: src/service/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Претраге смештаја података су закључене (видех све)"
 
-#: src/fs/gnunet-service-fs_pr.c:1526
+#: src/service/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Претраге смештаја података су прекинуте (више од „MAX_RESULTS“)"
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/service/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr "# блокови на-захтев одговарају захтевима"
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/service/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr "# претраге на-захтев су обављене успешно"
 
-#: src/fs/gnunet-service-fs_pr.c:1570
+#: src/service/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr "# претраге на-захтев нису успеле"
 
-#: src/fs/gnunet-service-fs_pr.c:1616
+#: src/service/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr "# Претраге смештаја података су закључене (нађох последњи резултат)"
 
-#: src/fs/gnunet-service-fs_pr.c:1629
+#: src/service/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Претраге смештаја података су закључене (утовар је превелик)"
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/service/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr "# Претраге смештаја података су покренуте"
 
-#: src/fs/gnunet-service-fs_pr.c:1744
+#: src/service/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr "# поруке ЈАЗ СТАВИ су примљене"
 
-#: src/fs/gnunet-service-fs_push.c:643
+#: src/service/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr "време је затражено, гурање садржаја је искључено"
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr "Поништавам индексирање при %llu/%llu (преостаје %s)\n"
-
-#: src/fs/gnunet-unindex.c:103
-#, c-format
-msgid "Error unindexing: %s.\n"
-msgstr "Грешка поништавања индексирања: %s.\n"
-
-#: src/fs/gnunet-unindex.c:109
-msgid "Unindexing done.\n"
-msgstr "Поништавање индексирања је готово.\n"
-
-#: src/fs/gnunet-unindex.c:142
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr ""
-"Морате навести један и само један назив датотеке за поништавање "
-"индексирања.\n"
-
-#: src/fs/gnunet-unindex.c:162
-msgid "Could not start unindex operation.\n"
-msgstr "Не могу да започнем радњу поништавања индексирања.\n"
-
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
-msgstr ""
-"Поништава индексирање датотеке која је претходно била индексирана са „gnunet-"
-"publish“."
-
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
 msgid "metadata length"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
+#: src/service/fs/meta_data.c:1073
 #, fuzzy, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr "Серијализовани метаподаци „%s“ су већи од дозвољеног (%u>%u)"
 
-#: src/fs/meta_data.c:1092
+#: src/service/fs/meta_data.c:1092
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
 
-#: src/fs/meta_data.c:1124
+#: src/service/fs/meta_data.c:1124
 #, fuzzy, c-format
 msgid "Serialized %ld bytes of metadata"
 msgstr "\t<изворна датотека угнеждена у %u бајта метаподатака>\n"
 
-#: src/fs/meta_data.c:1131
+#: src/service/fs/meta_data.c:1131
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
 
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "%.s Непознат код резултата."
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Нисам нашао садржај"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
-#, fuzzy
-msgid "Identifier already in use for another ego."
-msgstr "одредник се већ користи за други его"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "%.s Непознат код резултата."
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# Бирање парњака није успело"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Нисам нашао садржај"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "нисам нашао „upnpc“\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Смештај назива није успео да смести запис\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "Није дат парњак!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "Није дат парњак!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "Нису дате опције\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
-#, fuzzy
-msgid "Record already exists."
-msgstr "назив мете већ постоји"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Смештај назива није успео да смести запис\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
-#: src/gns/gns_tld_api.c:292
+#: src/service/gns/gns_tld_api.c:292
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
+#: src/service/gns/gnunet-bcd.c:573
 #, fuzzy, c-format
 msgid "Invalid port number %u\n"
 msgstr "Неисправан број прикључника %llu.  Излазим.\n"
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
 msgid "Unable to set up the daemon\n"
 msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
 msgid "Failed to start HTTP server\n"
 msgstr "Нисам успео да покренем ХТТП сервер\n"
 
-#: src/gns/gnunet-bcd.c:660
+#: src/service/gns/gnunet-bcd.c:660
 #, fuzzy
 msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr "Покрећем ХТТП сервер на прикључнику ПРИКЉУЧНИК (основно је 8888)"
 
-#: src/gns/gnunet-bcd.c:669
+#: src/service/gns/gnunet-bcd.c:669
 msgid "GNUnet HTTP server to create business cards"
 msgstr "ГНУнет ХТТП сервер за стварање бизнис картица"
 
-#: src/gns/gnunet-dns2gns.c:296
+#: src/service/gns/gnunet-dns2gns.c:296
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Нисам успео да упакујем ДНС одговор у УДП пакет!\n"
 
-#: src/gns/gnunet-dns2gns.c:377
+#: src/service/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Нисам успео да обрадим ДНС одговор\n"
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/service/gns/gnunet-dns2gns.c:451
 #, fuzzy, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr "АТС је вратио резултате за %u адресе\n"
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/service/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Не могу да обрадим ДНС захтев од „%s“\n"
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/service/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Примих лош ДНС захтев од „%s“\n"
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/service/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Примих неподржан ДНС захтев од „%s“\n"
 
-#: src/gns/gnunet-dns2gns.c:839
+#: src/service/gns/gnunet-dns2gns.c:839
 msgid "No DNS server specified!\n"
 msgstr "Није наведен ДНС сервер!\n"
 
-#: src/gns/gnunet-dns2gns.c:999
+#: src/service/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "ИП дубинског ДНС решавача за коришћење (потребно)"
 
-#: src/gns/gnunet-dns2gns.c:1016
+#: src/service/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Посредник ДНС-до-ГНС ГНУнет-а (ДНС сервер)"
 
-#: src/gns/gnunet-gns-benchmark.c:582
+#: src/service/gns/gnunet-gns-benchmark.c:582
 #, fuzzy
 msgid "how long to wait between queries"
 msgstr "време за чекање између прорачуна"
 
-#: src/gns/gnunet-gns-benchmark.c:588
+#: src/service/gns/gnunet-gns-benchmark.c:588
 msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
+#: src/service/gns/gnunet-gns-benchmark.c:593
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
+#: src/service/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr "Овај програм ће увести неке ГНС ауторитете у ваш ГНС смештај назива."
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "„%s“ није успело на %s:%d: „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:979
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Неподржан CURL SSL позадинац %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Нисам успео да довучем ЦН из уверења: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Нисам успео да покренем ДАНЕ: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Нисам успео да обрадим ДАНЕ запис: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Нисам успео да потврдим ТЛС везу користећи ДАНЕ: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr "Неуспела ДАНЕ провера није успела са кодом стања ГнуТЛС провере: %u\n"
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, fuzzy, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr "Назив субјекта ССЛ уверења (%s) не одговара „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr "Домен колачића „%s“ које је доставио сервер је неисправан\n"
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Неподржан ХТТП метод „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/service/gns/gnunet-gns-proxy.c:2654
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Не могу да увезем приватни кључ из датотеке „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/service/gns/gnunet-gns-proxy.c:2686
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Не могу да увезем уверење „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/service/gns/gnunet-gns-proxy.c:2895
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Нисам успео да покренем ХТТПС сервер за „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
 msgid "Failed to pass client to MHD\n"
 msgstr "Нисам успео да проследим клијента МХД-у\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/service/gns/gnunet-gns-proxy.c:3268
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Неподржано издање прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/service/gns/gnunet-gns-proxy.c:3300
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Неподржана наредба прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Неподржана врста адресе прикључнице %d\n"
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Нисам успео да учитам ССЛ/ТЛС кључ и уверење из „%s“\n"
 
-#: src/gns/gnunet-gns-proxy.c:3868
+#: src/service/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr "ослушкиван на наведеном прикључнику (основно: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3873
+#: src/service/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr "пем датотека за коришћење као издавач уверења"
 
-#: src/gns/gnunet-gns-proxy.c:3877
+#: src/service/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
+#: src/service/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr "ГНУнет ГНС посредник"
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "„%s“ није исправна ИП адреса.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Нисам успео да претворим ДНС ИДНА „%s“ у УТФ-8: %s\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr "Претражује запис за датим називом"
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr "Наводи врсту записа за претраживање"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Наводи време истека за претраживање"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr "Нема непотребног излаза"
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-msgid "GNUnet GNS resolver tool"
-msgstr "Алат ГНУнет ГНС решавача"
-
-#: src/gns/gnunet-service-gns.c:518
+#: src/service/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "исправан јавни кључ се захтева"
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
 msgid "Failed to connect to the namecache!\n"
 msgstr "Нисам успео да се повежем са оставом назива!\n"
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
 msgid "Could not connect to DHT!\n"
 msgstr "Не могу да се повежем на ДХТ!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Грешка претварања ГНС одговора у ДНС одговор!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Нисам успео да се повежем са ДНС услугом!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:900
+#: src/service/gns/gnunet-service-gns_resolver.c:900
 msgid "Failed to parse DNS response\n"
 msgstr "Нисам успео да обрадим ДНС одговор\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr "Прескачем запис неподржане врсте %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr "ГНС претраживање је резултирало ДНС називом који је предуг („%s“)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Дубачење ГНС претраге није успело (нисам нашао запис изасланства)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr "Дубачење ГНС претраге није успело (нисам нашао запис изасланства)\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Нисам успео да сместим у оставу ГНС резолуцију: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, fuzzy, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr "АТС је вратио резултате за %u адресе\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr "Зона %s је опозвана, резолуција није успела\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "Не могу да обрадим „MX“ запис „%s“\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:213
-#, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
-msgstr "Не могу да обрадим „GNS2DNS“ запис „%s“\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:230
-#, fuzzy, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
-msgstr "Нисам успео да серијализујем ГНС2ДНС запис са вредношћу „%s“\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:254
-#, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Не могу да обрадим ниску ВПН записа „%s“\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "Не могу да обрадим ниску ВПН записа „%s“\n"
-
-#: src/gns/plugin_rest_gns.c:450
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr "Меш је покренут\n"
-
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
-#, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
-msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
-msgstr "Нисам успео да серијализујем ЦНАЗИВ запис са вредношћу „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
-msgstr "Нисам успео да серијализујем УВЕР запис са %u бајта\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
-#, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
-msgstr ""
-"Нисам успео да серијализујем СОА запис са називом „%s“ и р-називом „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
-#, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
-msgstr "Нисам успео да серијализујем ПТР запис са вредношћу „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
-#, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Не могу да обрадим „MX“ запис „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
-#, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
-msgstr "Нисам успео да серијализујем МИкс запис са називом домаћина „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "Нисам успео да серијализујем НС запис са вредношћу „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
-#, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Не могу да обрадим ИПв6 адресу „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
-#, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "Не могу да обрадим ниску ТЛСА записа „%s“\n"
-
-#: src/hello/gnunet-hello.c:303
-#, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr "Грешка приступа датотеци „%s“: %s\n"
-
-#: src/hello/gnunet-hello.c:310
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
-msgstr "Датотека „%s“ је превелика да би била „HELLO“\n"
-
-#: src/hello/gnunet-hello.c:315
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
-msgstr "Датотека „%s“ је премала да би била „HELLO“\n"
-
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
-#, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "Грешка отварања датотеке „%s“: %s\n"
-
-#: src/hello/gnunet-hello.c:339
-#, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
-msgstr "Нисам нашао лепо формирано „HELLO“ у датотеци „%s“\n"
-
-#: src/hello/gnunet-hello.c:386
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
-msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %s\n"
-
-#: src/hello/gnunet-hello.c:395
-#, fuzzy, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
-msgstr "Измењених адреса — %u \n"
-
-#: src/hello/gnunet-hello.c:409
-#, fuzzy
-msgid "Hello file to read"
-msgstr "пем датотека за коришћење као издавач уверења"
-
-#: src/hello/gnunet-hello.c:418
-msgid "Print information about peers."
-msgstr "Исписује податке о парњацима."
-
-#: src/hello/hello.c:1089
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "Нисам успео да обрадим „HELLO“ поруку: недостаје време истека\n"
-
-#: src/hello/hello.c:1099
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "Нисам успео да обрадим „HELLO“ поруку: неисправно време истека\n"
-
-#: src/hello/hello.c:1109
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "Нисам успео да обрадим „HELLO“ поруку: лоша\n"
-
-#: src/hello/hello.c:1121
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr "Нисам успео да обрадим „HELLO“ поруку: недостаје прикључак преноса\n"
-
-#: src/hello/hello.c:1139
-#, fuzzy, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr "Нисам нашао прикључак „%s“\n"
-
-#: src/hello/hello.c:1147
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr "Прикључак „%s“ још не подржава УРИ-је\n"
-
-#: src/hello/hello.c:1162
-#, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "Нисам успео да обрадим „%s“ као адресу за прикључак „%s“\n"
-
-#: src/hostlist/gnunet-daemon-hostlist.c:306
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4089,11 +6353,11 @@ msgstr ""
 "Ниједна од функција за демона списка домаћина није укључена.  Немам разлога "
 "да радим било шта!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr "рекламира наш списак домаћина другим парњацима"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4101,46 +6365,46 @@ msgstr ""
 "почетно подизање помоћу спискова домаћина (врло се препоручује да увек "
 "користите ову опцију)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr "укључује учење о серверима списка домаћина са других парњака"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr "обезбеђује сервер списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr "Сервер и клијент списка домаћина ГНУнет-а"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# бајтови су преузети са сервера списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# неисправни „HELLO“-и су преузети са сервера списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Неисправна „%s“ порука је примљена са списка домаћина на „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# исправни „HELLO“-и су преузети са сервера списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
 msgid "# advertised hostlist URIs"
 msgstr "# рекламиране путање списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# рекламирана путања „%s“ је преузета"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4149,117 +6413,117 @@ msgstr ""
 "Рекламирани списак домаћина са путањом „%s“ се не може преузети. Рекламирана "
 "путања је одбачена.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Време је истекло у покушају преузимања списка домаћина са „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 "Ограничење преузимања од %u бајта је премашено, заустављам преузимање\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Преузимање списка доамаћина са „%s“ није успело: „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Преузимање списка домаћина „%s“ је завршено.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Додаје успешно тестирани смештај података „%s“ списка домаћина.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Вршим почетно подизање помоћу списка домаћина на „%s“.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
 msgid "# hostlist downloads initiated"
 msgstr "# преузимања списка домаћина су започета"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
 msgid "# milliseconds between hostlist downloads"
 msgstr "# милисекунди између преузимања списка домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr "Имам %u/%u везе.  Размотрићу преузимање списка домаћина за %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
 msgid "# active connections"
 msgstr "# активних веза"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Учитавам сачуване уносе списка домаћина из датотеке „%s“ \n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Датотека списка домаћина „%s“ не постоји\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "Не могу да отворим датотеку „%s“ за читање да утоварим спискове домаћина: "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "УРИ-и %u списка домаћина су учитани из датотеке\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
 msgid "# hostlist URIs read from file"
 msgstr "# УРИ-и списка домаћина су учитани из датотеке"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Не могу да отворим датотеку „%s“ за писање да сачувам спискове домаћина: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Уписујем УРИ-је %u списка домаћина у „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Грешка писања УРИ-а списка домаћина у датотеку „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
 msgid "# hostlist URIs written to file"
 msgstr "# УРИ-и списка домаћина су записани у датотеку"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
 msgid "Learning is enabled on this peer\n"
 msgstr "Учење је укључено на овом парњаку\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is not enabled on this peer\n"
 msgstr "Учење није укључено на овом парњаку\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4267,1108 +6531,530 @@ msgstr ""
 "Како учење није укључено на овом парњаку, датотека списка домаћина „%s“ је "
 "уклоњена\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
 msgid "bytes in hostlist"
 msgstr "бајтова у списку домаћина"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
-#, fuzzy, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
-msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-#, fuzzy
-msgid "Expired HELLO encountered (ignored)"
-msgstr "наиђох на „HELLO“-е без адреса (занемарено)"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
 msgid "bytes not included in hostlist (size limit)"
 msgstr "бајтови нису укључени на списак домаћина (ограничење величине)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Одбијам „%s“ захтев за сервер списка домаћина\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "захтеви списка домаћина су одбијени (нису „HTTP GET“)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Одбијам „%s“ захтев са %llu бајта података утовара\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
 msgid "hostlist requests refused (upload data)"
 msgstr "захтеви списка домаћина су одбијени (подаци утовара)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr "Не могу да радим са захтевом списка домаћина јер још немам одговор\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
 msgid "hostlist requests refused (not ready)"
 msgstr "захтеви списка домаћина су одбијени (нису спремни)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "Received request for our hostlist\n"
 msgstr "Примих захтев за наш списак домаћина\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
 msgid "hostlist requests processed"
 msgstr "захтеви списка домаћина су обрађени"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "# hostlist advertisements send"
 msgstr "# рекламе списка домаћина су послате"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, fuzzy, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
+msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
+
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
 #, fuzzy
 msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr "Не могу да приступим услузи ИНФО_ПАРЊАКА.  Излазим.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Неисправан број прикључника %llu.  Излазим.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Услуга списка домаћина почиње на %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Адреса за добијање списка домаћина: „%s“\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "„%s“ није исправна ИП адреса! Занемарујем „BINDTOIP“.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "„%s“ није исправна ИП адреса! Занемарујем „BINDTOIP“.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "„%s“ није исправна ИП адреса! Занемарујем „BINDTOIP“.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "„%s“ није исправна ИП адреса! Занемарујем „BINDTOIP“.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Не могу да покренем ХТТП сервер списка домаћина на прикључнику %u\n"
 
-#: src/identity/gnunet-identity.c:225
-#, c-format
-msgid "Failed to create ego: %s\n"
-msgstr "Нисам успео да направим его: %s\n"
-
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
-msgstr "ствара НАЗИВ ега"
-
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
-msgstr "брише НАЗИВ ега "
-
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
-msgstr ""
-
-#
-# File: util/dialtest.c++, line: 134
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
-msgstr "приказује све егое"
-
-#: src/identity/gnunet-identity.c:576
-#, fuzzy
-msgid "reduce output"
-msgstr "опширан излаз"
-
-#: src/identity/gnunet-identity.c:583
-#, fuzzy
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
-msgstr ""
-"поставља основни идентитет на ЕГО за подсистем ПОДСИСТЕМ (користите заједно "
-"са -s)"
-
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
-msgstr "ради у режиму праћења егоа"
-
-#: src/identity/gnunet-identity.c:597
-msgid "display private keys as well"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
-msgstr "Одржава егое"
-
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Нисам успео да запишем основну мапу одредника подсистема у „%s“.\n"
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/identity/gnunet-service-identity.c:921
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Нисам успео да обрадим податке егоа у „%s“\n"
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/identity/gnunet-service-identity.c:979
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 "Нисам успео да обрадим датотеку подешавања идентитета субсистема „%s“\n"
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/identity/gnunet-service-identity.c:988
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Нисам успео да направим директоријум „%s“ за смештајне егое\n"
 
-#: src/identity/plugin_rest_identity.c:1245
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“: %s\n"
-
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Не могу да обрадим „SOA“ запис „%s“\n"
 
-#: src/namecache/gnunet-namecache.c:105
-#, c-format
-msgid "No records found for `%s'"
-msgstr "Нисам нашао записе за „%s“"
-
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr "\tОштећен или неподржан запис врсте %u\n"
-
-#: src/namecache/gnunet-namecache.c:174
-#, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "Морате навести којој зони се треба приступити\n"
-
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
-
-#: src/namecache/gnunet-namecache.c:187
-#, c-format
-msgid "You must specify a name\n"
-msgstr "Морате навести назив\n"
-
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
-msgstr "назив записа за додавање/брисање/приказ"
-
-#: src/namecache/gnunet-namecache.c:220
-#, fuzzy
-msgid "specifies the public key of the zone to look in"
-msgstr "наводи јавни кључ зоне за претраживање"
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-msgid "GNUnet zone manipulation tool"
-msgstr "Алат манипуслисања ГНУнет зоном"
-
-#: src/namecache/namecache_api.c:283
+#: src/service/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr "Остава назива није успела да смести у оставу блок"
 
-#: src/namecache/namecache_api.c:371
+#: src/service/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Грешка у комуникацији са услугом ПОДАЦИ_ПАРЊАКА: %s\n"
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "Не могу да покренем СКуЛајт: %s.\n"
-
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Не могу да покренем СКуЛајт: %s.\n"
-
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Нисам успео да прочитам датотеку"
-
-#: src/namecache/plugin_namecache_flat.c:404
-msgid "flat plugin running\n"
-msgstr ""
-
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Нисам успео да покренем „%s“ на „%s“\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "Алат манипуслисања ГНУнет зоном"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "Не могу да покренем главног контролора"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Нисам успео да се повежем са смештајем назива\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Нисам успео да направим запис за домен „%s“: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
 #, fuzzy
 msgid "no errors"
 msgstr "непозната грешка"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "Грешка стварања тунела\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
 #, fuzzy
 msgid "unable to store record"
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
 #, fuzzy
 msgid "invalid name"
 msgstr "Неисправан аргумент „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Не могу да обрадим „MX“ запис „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Не могу да обрадим „MX“ запис „%s“\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr "Није подешен его за „fcfsd“ подсистем\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
 #, fuzzy
 msgid "No expiration specified for records.\n"
 msgstr "Није наведена ниједна радња. Немам шта да радим.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
 msgid "No port specified, using default value\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
 msgid "Failed to connect to identity\n"
 msgstr "Нисам успео да се повежем са идентитетом\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
 #, fuzzy
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr "Услуга регистрације назива Први Стиже Први Служи ГНУ Система Назива"
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Смештај назива није успео да смести запис\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "Регуларни израз „%s“ је превелик!\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Нисам успео да обрадим УРИ: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Нисам успео да обрадим УРИ: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Кључ „%s“ је исправан\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Нисам успео да се повежем са ГНС-ом\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Нисам успео да се повежем са ГНС-ом\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-msgid "name of the ego controlling the zone"
-msgstr "назив егоа који контролише зону"
-
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Недостаје функција „%s“ у прикључку преноса за „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Непозната наредба „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
-
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Неисправан формат за ИП: „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr "Додавање записа није успело: %s\n"
-
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Брисање записа није успело%s%s\n"
-
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
-#, fuzzy, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr "Нема позива који би могао бити отказан управо сада.\n"
-
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
-msgstr "Нису дате опције\n"
-
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "Недостаје опција „%s“ за радњу „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1381
-msgid "name"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1410
-#, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Неисправан надимак „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr "додај"
-
-#: src/namestore/gnunet-namestore.c:1461
-#, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Неподржана врста „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1471
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1491
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr "Вредност „%s“ је неисправна за врсту записа „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "Неисправан формат времена „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr "обриши"
-
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1642
-#, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr "Неисправан јавни кључ за обратну претрагу „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1679
-#, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Неисправан УРИ „%s“\n"
-
-#: src/namestore/gnunet-namestore.c:1967
-#, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "Не могу да се повежем са услугом идентитета\n"
-
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr "додаје запис"
-
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr "брише запис"
-
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr "приказује записе"
-
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr "време истека записа за коришћење (само за додавање), „never“ је могуће"
-
-#: src/namestore/gnunet-namestore.c:2010
-msgid "set the desired nick name for the zone"
-msgstr "поставља жељени назив надимка за зону"
-
-#: src/namestore/gnunet-namestore.c:2015
-msgid "monitor changes in the namestore"
-msgstr "прати измене у смештају назива"
-
-#: src/namestore/gnunet-namestore.c:2025
-msgid "Output in recordline format"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2031
-#, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "одређује наш назив за дати „PKEY“"
-
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
-msgstr "врста записа за додавање/брисање/приказ"
-
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
-msgstr "УРИ за увоз у нашу зону"
-
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
-msgstr "вредност записа за додавање/брисање"
-
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
-msgstr "ствара или исписује јавни запис"
-
-#: src/namestore/gnunet-namestore.c:2056
-#, fuzzy
-msgid "omit private records"
-msgstr "приказује записе"
-
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-"прави сеновити запис (важи само ако су сви остали записи исте врсте истекли"
-
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:792
-#, fuzzy
-msgid "Flat file database running\n"
-msgstr "База података шаблона ради\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Нисам успео да покренем „%s“ на „%s“\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:956
-#, fuzzy
-msgid "SQlite database running\n"
-msgstr "База података Скулајта ради\n"
-
-#: src/namestore/plugin_rest_namestore.c:1320
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Меш је покренут\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:189
-#, fuzzy
-msgid "Suggested configuration changes:\n"
-msgstr "Недостају поставке подешавања кључа.\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Нисам успео да уклоним датотеку подешавања „%s“\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, fuzzy, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr "Не могу да приступим датотеци подешавања „%s“\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:327
-#, fuzzy
-msgid "run autoconfiguration"
-msgstr "# пријатељи у подешавањима"
-
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "write configuration file (for autoconfiguration)"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:355
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr "Демон помоћника теста ГНУнет НАТ попречника"
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Нисам успео да се повежем на „gnunet-nat-server“\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 "Нисам успео да направим свезу прикључнице ослушкивања ка „%s“ за НАТ тест: "
 "%s\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr "нисам нашао „upnpc“ наредбу"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "НАТ попречник са ИЦМП сервером је успео.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "НАТ попречник са ИЦМП сервером није успео.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Тестира обратност везе са ИЦМП сервером.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Откривен је спољни ИП „%s“\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr "Овај систем има општу ИПв6 адресу, постављам ИПв6 на подржану.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Откривена је унутрашња адреса мреже „%s“.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr "нађох „upnpc“, омогућујем њено коришћење\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
 msgid "upnpc not found\n"
 msgstr "нисам нашао „upnpc“\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr "Нисам нашао радну „gnunet-helper-nat-server“\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
+#: src/service/nat-auto/nat_auto_api.c:73
 #, fuzzy
 msgid "Operation Successful"
 msgstr "Опозивање је успело.\n"
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/service/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
+#: src/service/nat-auto/nat_auto_api.c:79
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/service/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
+#: src/service/nat-auto/nat_auto_api.c:85
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/service/nat-auto/nat_auto_api.c:88
 msgid "`upnpc` command not found"
 msgstr "нисам нашао „upnpc“ наредбу"
 
-#: src/nat-auto/nat_auto_api.c:91
+#: src/service/nat-auto/nat_auto_api.c:91
 msgid "Failed to run `upnpc` command"
 msgstr "Нисам успео да покренем наредбу „upnpc“"
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/service/nat-auto/nat_auto_api.c:94
 msgid "`upnpc' command took too long, process killed"
 msgstr "„upnpc“ наредби треба превише времена, процес је убијен"
 
-#: src/nat-auto/nat_auto_api.c:97
+#: src/service/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr "„upnpc“ наредба није успела да успостави мапирање прикључника"
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/service/nat-auto/nat_auto_api.c:100
 msgid "`external-ip' command not found"
 msgstr "нисам нашао наредбу „external-ip“"
 
-#: src/nat-auto/nat_auto_api.c:103
+#: src/service/nat-auto/nat_auto_api.c:103
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Нисам успео да покренем наредбу „upnpc“"
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/service/nat-auto/nat_auto_api.c:106
 #, fuzzy
 msgid "`external-ip' command output invalid"
 msgstr "нисам нашао наредбу „external-ip“"
 
-#: src/nat-auto/nat_auto_api.c:109
+#: src/service/nat-auto/nat_auto_api.c:109
 msgid "no valid address was returned by `external-ip'"
 msgstr "ниједна исправна адреса није враћена „external-ip“-ом"
 
-#: src/nat-auto/nat_auto_api.c:113
+#: src/service/nat-auto/nat_auto_api.c:113
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Не могу да одредим путању инсталирања прикључка.\n"
 
-#: src/nat-auto/nat_auto_api.c:116
+#: src/service/nat-auto/nat_auto_api.c:116
 #, fuzzy
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr "Нисам нашао радну „gnunet-helper-nat-server“\n"
 
-#: src/nat-auto/nat_auto_api.c:119
+#: src/service/nat-auto/nat_auto_api.c:119
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
+#: src/service/nat-auto/nat_auto_api.c:122
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
+#: src/service/nat-auto/nat_auto_api.c:125
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
+#: src/service/nat-auto/nat_auto_api.c:128
 #, fuzzy
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr "Нисам нашао радну „gnunet-helper-nat-server“\n"
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Нисам успео да прочитам директоријум „%s“\n"
 
-#: src/nat-auto/nat_auto_api_test.c:489
+#: src/service/nat-auto/nat_auto_api_test.c:489
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 "Нисам успео да направим свезу прикључнице ослушкивања ка „%s“ за НАТ тест: "
 "%s\n"
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:464
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr "Демон помоћника теста ГНУнет НАТ попречника"
-
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/nat/gnunet-service-nat.c:1362
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1861
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Веза је успостављена.\n"
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1935
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr "„gnunet-helper-nat-server“ је створила лошу адресу „%s“\n"
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, c-format
 msgid "Failed to start %s\n"
 msgstr "Нисам успео да покренем „%s“\n"
 
-#: src/nat/gnunet-service-nat_mini.c:188
+#: src/service/nat/gnunet-service-nat_mini.c:188
 msgid "`external-ip' command not found\n"
 msgstr "нисам нашао наредбу „external-ip“\n"
 
-#: src/nat/gnunet-service-nat_mini.c:602
+#: src/service/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr "нисам нашао „upnpc“ наредбу\n"
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/service/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "ограничење броја веза на НСЕ услуге, 0 за ништа"
 
-#: src/nse/gnunet-nse-profiler.c:864
+#: src/service/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing connection information and statistics"
 msgstr "назив датотеке за записивање података везе и статистику"
 
-#: src/nse/gnunet-nse-profiler.c:879
+#: src/service/nse/gnunet-nse-profiler.c:879
 msgid "name of the file for writing the main results"
 msgstr "назив датотеке за записивање главних резултата"
 
-#: src/nse/gnunet-nse-profiler.c:888
+#: src/service/nse/gnunet-nse-profiler.c:888
 msgid "Number of peers to run in each round, separated by commas"
 msgstr "Број парњака за покретање у свакој рунди, раздвојени зарезима"
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/service/nse/gnunet-nse-profiler.c:900
 msgid "delay between rounds"
 msgstr "застој између рунди"
 
-#: src/nse/gnunet-nse-profiler.c:912
+#: src/service/nse/gnunet-nse-profiler.c:912
 msgid "Measure quality and performance of the NSE service."
 msgstr "Мери квалитет и учинковитост НСЕ услуге."
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr "Показује процене величине мреже из НСЕ услуге."
-
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-msgid "Value is too large.\n"
-msgstr "Вредност је превелика.\n"
-
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/service/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Нисам успео да обрадим „HELLO“ у датотеци „%s“: %s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:657
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Не могу да отворим „%s“.\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Увозим „HELLO“-е из „%s“\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:688
+#: src/service/peerstore/gnunet-service-peerstore.c:692
 msgid "Skipping import of included HELLOs\n"
 msgstr "Прескачем увоз укључених „HELLO“-а\n"
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:781
+#: src/service/peerstore/peerstore_api.c:781
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Примих лош ДНС захтев од „%s“\n"
 
-#: src/peerstore/peerstore_api.c:895
+#: src/service/peerstore/peerstore_api.c:895
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, c-format
 msgid ""
 "Error executing SQL query: %s\n"
@@ -5377,7 +7063,7 @@ msgstr ""
 "Грешка извршавања СКуЛ упита: %s\n"
 "  %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
@@ -5386,801 +7072,237 @@ msgstr ""
 "Грешка припремања СКуЛ упита: %s\n"
 "  %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Нисам успео да направим индексе\n"
 
-#: src/pt/gnunet-daemon-pt.c:416
+#: src/service/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Нисам успео да упакујем ДНС захтев.  Одбацујем.\n"
 
-#: src/pt/gnunet-daemon-pt.c:422
+#: src/service/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr "# ДНС захтеви су мапирани у ВПН"
 
-#: src/pt/gnunet-daemon-pt.c:476
+#: src/service/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr "# ДНС записи су измењени"
 
-#: src/pt/gnunet-daemon-pt.c:671
+#: src/service/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr "# ДНС одговори су пресретени"
 
-#: src/pt/gnunet-daemon-pt.c:678
+#: src/service/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Нисам успео да обрадим ДНС захтев.  Одбацујем.\n"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/service/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr "# ДНС захтеви су одбачени (истекло је време)"
 
-#: src/pt/gnunet-daemon-pt.c:771
+#: src/service/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr "# ДНС захтеви су пресретени"
 
-#: src/pt/gnunet-daemon-pt.c:777
+#: src/service/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# ДНС захтеви су одбачени (ДНС меш канал је пао)"
 
-#: src/pt/gnunet-daemon-pt.c:786
+#: src/service/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr "# ДНС захтеви су одбачени (лоши су)"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/service/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr "# ДНС одговори су примљени"
 
-#: src/pt/gnunet-daemon-pt.c:898
+#: src/service/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr "# ДНС одговори су одбачени (прекасно је?)"
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Нисам успео да се повежем са „%s“ услугом.  Излазим.\n"
 
-#: src/pt/gnunet-daemon-pt.c:1314
+#: src/service/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr "Демон за покретање за обављање превода ИП протокола у ГНУнет"
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:805
-#, fuzzy, c-format
-msgid "Ego is required\n"
-msgstr "Потребна је исправна врста\n"
-
-#: src/reclaim/gnunet-reclaim.c:812
-#, c-format
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:819
-#, fuzzy, c-format
-msgid "Requesting party key is required!\n"
-msgstr "аргумент „--section“ је потребан\n"
-
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:852
-msgid "The EGO to use"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
-msgstr ""
-
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-msgid "OpenID Connect REST API initialized\n"
-msgstr ""
-
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
-#: src/reclaim/reclaim_api.c:544
+#: src/service/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Смештај назива није успео да смести запис\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "„%s“ услузи недостају поставке подешавања кључа (%s).  Излазим.\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
 #, fuzzy
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr "Демон за најаву регуларних израза за парњака који користи меш."
 
-#: src/regex/gnunet-regex-profiler.c:1365
+#: src/service/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr "Није дата датотека подешавања. Излазим\n"
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr "На линији наредби није наведен директоријум политике. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Наведени директоријум политике не постоји. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1421
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "Нисам нашао датотеке у „%s“\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/service/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr "Није дата датотека ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1450
+#: src/service/regex/gnunet-regex-profiler.c:1450
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Грешка учитавања ниски претраге. Излазим.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1539
+#: src/service/regex/gnunet-regex-profiler.c:1539
 msgid "name of the file for writing statistics"
 msgstr "назив датотеке за записивање статистике"
 
-#: src/regex/gnunet-regex-profiler.c:1546
+#: src/service/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr "чека ВРЕМЕ_ИСТЕКА пре завршавања експеримента"
 
-#: src/regex/gnunet-regex-profiler.c:1552
+#: src/service/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr "директоријум са датотекама политике"
 
-#: src/regex/gnunet-regex-profiler.c:1559
+#: src/service/regex/gnunet-regex-profiler.c:1559
 msgid "name of file with input strings"
 msgstr "назив датотеке са улазним нискама"
 
-#: src/regex/gnunet-regex-profiler.c:1566
+#: src/service/regex/gnunet-regex-profiler.c:1566
 msgid "name of file with hosts' names"
 msgstr "назив датотеке са називима домаћина"
 
-#: src/regex/gnunet-regex-profiler.c:1581
+#: src/service/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr "Профилатор за регуларни израз"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr "назив табеле за уписивање ДФА-са"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr "највећа дужина сажимања путање"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr "Профилатор за библиотеку регуларног израза"
 
-#: src/regex/regex_api_announce.c:151
+#: src/service/regex/regex_api_announce.c:151
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "Регуларни израз „%s“ је превелик!\n"
 
-#: src/regex/regex_api_search.c:200
+#: src/service/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "Регуларни израз „%s“ је превелик!\n"
 
-#: src/rest/gnunet-rest-server.c:1369
+#: src/service/rest/gnunet-rest-server.c:1369
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Алат ГНУнет ГНС решавача"
 
-#: src/rest/plugin_rest_config.c:428
-msgid "CONFIG REST API initialized\n"
-msgstr ""
-
-#: src/rest/plugin_rest_copying.c:211
-msgid "COPYING REST API initialized\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "Покрећем %s...\n"
-
-#: src/revocation/gnunet-revocation.c:146
-#, c-format
-msgid "Key `%s' is valid\n"
-msgstr "Кључ „%s“ је исправан\n"
-
-#: src/revocation/gnunet-revocation.c:150
-#, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr "Тастер „%s“ је опозван\n"
-
-#: src/revocation/gnunet-revocation.c:154
-msgid "Internal error\n"
-msgstr "Унутрашња грешка\n"
-
-#: src/revocation/gnunet-revocation.c:180
-#, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
-msgstr "Кључ за его „%s“ још увек важи, опозивање није успело (!)\n"
-
-#: src/revocation/gnunet-revocation.c:183
-msgid "Revocation failed (!)\n"
-msgstr "Опозивање није успело (!)\n"
-
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
-msgstr "Кључ за его „%s“ је успешно опозван\n"
-
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
-msgstr "Опозивање је успело.\n"
-
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
-msgstr "Унутрашња грешка, опозив кључа можда није успео\n"
-
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
-msgstr "Уверење опозива за „%s“ је смештено у „%s“\n"
-
-#: src/revocation/gnunet-revocation.c:334
-#, c-format
-msgid "Ego `%s' not found.\n"
-msgstr "Нисам нашао его „%s“.\n"
-
-#: src/revocation/gnunet-revocation.c:350
-#, fuzzy, c-format
-msgid "Error: Key is invalid\n"
-msgstr "Кључ „%s“ је исправан\n"
-
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
-msgstr "Грешка: уверење опозива у „%s“ није за „%s“\n"
-
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
-msgstr "Уверење опозива је спремно\n"
-
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
-msgstr "Уверење опозива није спремно, израчунавам доказ о раду\n"
-
-#: src/revocation/gnunet-revocation.c:424
-#, c-format
-msgid "Public key `%s' malformed\n"
-msgstr "Јавни кључ „%s“ је лош\n"
-
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
-msgstr ""
-"Тестирање и опозивање у исто време није дозвољено, само тестирање "
-"извршавам.\n"
-
-#: src/revocation/gnunet-revocation.c:464
-msgid "No filename to store revocation certificate given.\n"
-msgstr "Није дат назив датотеке за смештање уверења опозива.\n"
-
-#: src/revocation/gnunet-revocation.c:481
-#, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
-msgstr "Нисам успео да прочитам уверење опозива из „%s“\n"
-
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "Уверење опозива за „%s“ је смештено у „%s“\n"
-
-#: src/revocation/gnunet-revocation.c:511
-msgid "No action specified. Nothing to do.\n"
-msgstr "Није наведена ниједна радња. Немам шта да радим.\n"
-
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
-msgstr "користи НАЗИВ за назив датотеке опозивања"
-
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
-msgstr "опозива лични кључ придружен личном кључу са его НАЗИВОМ "
-
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
-msgstr "заправо обавља опозив, у супротном само радимо предизрачунавање"
-
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
-msgstr "тестира да ли је јавни кључ КЉУЧ опозван"
-
-#: src/revocation/gnunet-revocation.c:558
-msgid "number of epochs to calculate for"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:539
+#: src/service/revocation/gnunet-service-revocation.c:539
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Двоструки опзив је примљен од парњака. Занемарено.\n"
 
-#: src/revocation/gnunet-service-revocation.c:549
+#: src/service/revocation/gnunet-service-revocation.c:549
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# поруке ПОДАТАКА су примљене путем блутута"
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr "Грешка прорачуна уније скупа опозивања са %s\n"
 
-#: src/revocation/gnunet-service-revocation.c:558
+#: src/service/revocation/gnunet-service-revocation.c:558
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# Бирање парњака није успело"
 
-#: src/revocation/gnunet-service-revocation.c:566
+#: src/service/revocation/gnunet-service-revocation.c:566
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# преноси расцепканости су завршени"
 
-#: src/revocation/gnunet-service-revocation.c:604
+#: src/service/revocation/gnunet-service-revocation.c:604
 msgid "SET service crashed, terminating revocation service\n"
 msgstr "Услуга ПОСТАВИ се урушила, окончавам услугу опозивања\n"
 
-#: src/revocation/gnunet-service-revocation.c:959
+#: src/service/revocation/gnunet-service-revocation.c:959
 msgid "Could not open revocation database file!"
 msgstr "Не могу да отворим датотеку базе података опозивања!"
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3148
-#, fuzzy
-msgid "timeout for the profiling"
-msgstr "Наводи време истека за претраживање"
-
-#: src/rps/gnunet-rps-profiler.c:3153
-#, fuzzy
-msgid "number of PeerIDs to request"
-msgstr "број парњака у концензусу"
-
-#: src/rps/gnunet-rps-profiler.c:3170
-#, fuzzy
-msgid "Measure quality and performance of the RPS service."
-msgstr "Мери квалитет и учинковитост НСЕ услуге."
-
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-msgid "You must specify at least one message ID to check!\n"
-msgstr "Морате навести бар један ИБ поруке за проверу!\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr "Овом програму је потребан одредник сесије за поређење вектора.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
-msgstr ""
-"Покушах да поставим режим покретача, јер је ИБ парњака био дат. Било како "
-"било, „%s“ није добар одредник парњака.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-#, fuzzy
-msgid "Need elements to compute the scalarproduct, got none.\n"
-msgstr ""
-"Потребни су елементи за израчунавање производа вектора, нисам добио "
-"ниједан.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, fuzzy, c-format
-msgid "Malformed input, could not parse `%s'\n"
-msgstr "Лоша политика прикључника „%s“\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "Не могу да претворим „%s“ у „int32_t“.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
-msgstr ""
-"Зарезом раздвојен списак елемената за поређење као вектора са нашим удаљеним "
-"парњаком."
-
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
-msgstr ""
-"[Изборни] парњак са којим израчунавамо наш скаларни производ. Ако тај "
-"параметар није дат, услуга ће чекати да удаљени парњак прорачуна захтев."
-
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
-msgstr "ИБ преноса дељеног са парњаком."
-
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr "Израчунава Производ вектора са ГНУнет парњаком."
-
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-#, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr "Повезивање са МЕШОМ није успело\n"
-
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-msgid "number of peers in consensus"
-msgstr "број парњака у концензусу"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
-msgstr "застој „dkg“ почетка"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
-msgstr "време истека „dkg“-а"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr "осетљивост"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
-msgstr "такође опис профила"
-
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "Не могу да се повежем са „%s“ услугом!\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-msgid "number of element in set A-B"
-msgstr "број елемената у скупу A-B"
-
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-msgid "number of element in set B-A"
-msgstr "број елемената у скупу B-A"
-
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
-msgstr "број заједничких елемената у A и B"
-
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr "хеш број"
-
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr "„ibf“ величина"
-
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-msgid "number of values"
-msgstr "број вредности"
-
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-#, fuzzy
-msgid "operation to execute"
-msgstr "операција за извршавање"
-
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-#, fuzzy
-msgid "element size"
-msgstr "експеримент за коришћење"
-
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-#, fuzzy
-msgid "write statistics to file"
-msgstr "само исписује вредност статистике"
-
-#: src/seti/gnunet-seti-profiler.c:457
+#: src/service/seti/gnunet-seti-profiler.c:457
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
-msgstr ""
-
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
-msgstr ""
-
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Записујем %llu бајта статистике у „%s“\n"
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Учитавам %llu бајта статистике из „%s“\n"
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-msgid "Failed to obtain statistics.\n"
-msgstr "Нисам успео да добијем статистику.\n"
-
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr "Нисам успео да добијем статистику од домаћина „%s:%llu“\n"
-
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
-msgstr "Недостаје аргумент: подсистем \n"
-
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
-msgstr "Недостаје аргумент: назив\n"
-
-#: src/statistics/gnunet-statistics.c:577
-#, c-format
-msgid "No subsystem or name given\n"
-msgstr "Није дат подсистем или назив\n"
-
-#: src/statistics/gnunet-statistics.c:589
-#, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "Нисам успео да покренем рутину гледања\n"
-
-#: src/statistics/gnunet-statistics.c:725
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Неисправан аргумент „%s“\n"
-
-#: src/statistics/gnunet-statistics.c:742
-#, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Потребан је прикључник за повезивање са домаћином „%s“\n"
-
-#: src/statistics/gnunet-statistics.c:751
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-"Прикључник треба бити између 1 и 65535 за повезивање са домаћином „%s“\n"
-
-#: src/statistics/gnunet-statistics.c:783
-#, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
-msgstr "ограничава излаз на статистику за дати НАЗИВ"
-
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr "чини да вредност бива постављена трајном"
-
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
-msgstr "ограничава излаз на дати ПОДСИСТЕМ"
-
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
-msgstr "само исписује вредност статистике"
-
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
-msgstr "гледа вредност непрекидно"
-
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
-msgstr "повезује се са удаљеним домаћином"
-
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
-msgstr "прикључник за удаљеног домаћина"
-
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
-msgstr "Исписује статистику о ГНУнет радњама."
-
-#: src/statistics/statistics_api.c:749
+#: src/service/statistics/statistics_api.c:749
 msgid "Could not save some persistent statistics\n"
 msgstr "Не могу да сачувам нешто од трајне статистике\n"
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/testing/gnunet-testing.c:185
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Не могу да извучем кључ домаћина %u (померај је превелик?)\n"
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 "Непозната наредба, користите „q“ да прекинете или „r“ да поново покренете "
 "парњака\n"
 
-#: src/testing/gnunet-testing.c:386
+#: src/service/testing/gnunet-testing.c:386
 msgid "create unique configuration files"
 msgstr "ствара јединствене датотеке подешавања"
 
-#: src/testing/gnunet-testing.c:392
+#: src/service/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 "извлачи датотеку кључа доамћина из унапред прорачунатог списка кључа домаћина"
 
-#: src/testing/gnunet-testing.c:400
+#: src/service/testing/gnunet-testing.c:400
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -6188,41 +7310,35 @@ msgstr ""
 "број јединствених датотека подешавања за стварање, или број кључа домаћина "
 "за извлачење"
 
-#: src/testing/gnunet-testing.c:407
+#: src/service/testing/gnunet-testing.c:407
 msgid "configuration template"
 msgstr "шаблон подешавања"
 
-#: src/testing/gnunet-testing.c:415
+#: src/service/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 "покреће дату услугу, чека на стандардном улазу за „r“ (поновно покретање) "
 "или „q“ (излази)"
 
-#: src/testing/gnunet-testing.c:432
+#: src/service/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr "Алат линије наредби за приезуп библиотеци тестирања"
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr "Нетачан формат датотеке кључа домаћина: %s\n"
-
-#: src/testing/list-keys.c:92
+#: src/service/testing/list-keys.c:92
 msgid "list COUNT number of keys"
 msgstr "исписује УКУПНОСТ број парњака"
 
-#: src/testing/testing.c:291
+#: src/service/testing/testing.c:291
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "Нисам нашао датотеку кључева домаћина: %s\n"
 
-#: src/testing/testing.c:743
+#: src/service/testing/testing.c:743
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Број кључа %u не постоји\n"
 
-#: src/testing/testing.c:1217
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -6231,153 +7347,153 @@ msgstr ""
 "Покушали сте да направите пробно место са више од %u домаћина.  Прво пре "
 "свега израчунајте више кључева домаћина.\n"
 
-#: src/testing/testing.c:1226
+#: src/service/testing/testing.c:1226
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Нисам успео да покренем кључ домаћина за парњака %u\n"
 
-#: src/testing/testing.c:1236
+#: src/service/testing/testing.c:1236
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "опција „PRIVATE_KEY“ у одељку „PEER“ недостаје у подешавањима\n"
 
-#: src/testing/testing.c:1249
+#: src/service/testing/testing.c:1249
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Нисам успео да направим подешавање за парњака (нема довољно слободних "
 "прикључника?)\n"
 
-#: src/testing/testing.c:1265
+#: src/service/testing/testing.c:1265
 #, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Не могу да отворим датотеку кључа домаћина „%s“: %s\n"
 
-#: src/testing/testing.c:1279
+#: src/service/testing/testing.c:1279
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Нисам успео да запишем датотеку кључа домаћина за парњака %u: %s\n"
 
-#: src/testing/testing.c:1307
+#: src/service/testing/testing.c:1307
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Нисам успео да запишем датотеку подешавања „%s“ за парњака %u: %s\n"
 
-#: src/testing/testing.c:1413
+#: src/service/testing/testing.c:1413
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Нисам успео да покренем „%s“: %s\n"
 
-#: src/testing/testing.c:1664
+#: src/service/testing/testing.c:1664
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Нисам успео да учитам подешавање за „%s“\n"
 
-#: src/testing/testing.c:2795
+#: src/service/testing/testing.c:2795
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "Нисам нашао датотеку размештаја „%s“\n"
 
-#: src/testing/testing.c:2803
+#: src/service/testing/testing.c:2803
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Датотека размештаја „%s“ нема података\n"
 
-#: src/testing/testing.c:2811
+#: src/service/testing/testing.c:2811
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Не могу да прочитам датотеку размештаја „%s“\n"
 
-#: src/topology/gnunet-daemon-topology.c:257
+#: src/service/topology/gnunet-daemon-topology.c:257
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# захтеви везе су издати преносу"
 
-#: src/topology/gnunet-daemon-topology.c:451
+#: src/service/topology/gnunet-daemon-topology.c:451
 msgid "# HELLO messages gossipped"
 msgstr "# „HELLO“ поруке су наклопљене"
 
-#: src/topology/gnunet-daemon-topology.c:805
+#: src/service/topology/gnunet-daemon-topology.c:805
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "Нисам успео да се повежем са услугом језгра, не могу да радим размештајем!\n"
 
-#: src/topology/gnunet-daemon-topology.c:870
+#: src/service/topology/gnunet-daemon-topology.c:870
 msgid "# HELLO messages received"
 msgstr "# „HELLO“ поруке су примљене"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/service/topology/gnunet-daemon-topology.c:1005
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Услузи преноса недостају поставке подешавања кључа. Излазим.\n"
 
-#: src/transport/gnunet-communicator-quic.c:1787
+#: src/service/transport/gnunet-communicator-quic.c:1787
 msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
+#: src/service/transport/gnunet-communicator-tcp.c:4071
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
+#: src/service/transport/gnunet-communicator-udp.c:3433
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
+#: src/service/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Највећи број веза је %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1015
+#: src/service/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "„%s“ услузи недостају поставке подешавања кључа (%s).  Излазим.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Не могу да направим путању до „%s“\n"
 
-#: src/transport/gnunet-communicator-unix.c:1138
+#: src/service/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Пренесох %llu бајта/сек (%llu бајта за %s)\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/transport/gnunet-transport.c:415
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Примих %llu бајта/сек (%llu бајта за %s)\n"
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/transport/gnunet-transport.c:454
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Нисам успео да се повежем на „%s“\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/transport/gnunet-transport.c:466
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Нисам успео да решим адресу за парњака „%s“\n"
 
-#: src/transport/gnunet-transport.c:477
+#: src/service/transport/gnunet-transport.c:477
 #, fuzzy
 msgid "Failed to list connections, timeout occurred\n"
 msgstr "Нисам успео да испишем везе, дошло је до истека времена\n"
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/transport/gnunet-transport.c:504
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Преносим %u бајта ка %s\n"
 
-#: src/transport/gnunet-transport.c:537
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -6386,1283 +7502,252 @@ msgstr ""
 "Успешно смо повезани са „%s“, почињем да шаљем податке оцењивања у блоковима "
 "од %u Kb\n"
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/transport/gnunet-transport.c:566
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Прекинута је веза са парњаком „%s“ за време оцењивања\n"
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (укупно повезивања: %u)\n"
 
-#: src/transport/gnunet-transport.c:592
+#: src/service/transport/gnunet-transport.c:592
 msgid "Connected to"
 msgstr "Повезани сте са"
 
-#: src/transport/gnunet-transport.c:621
+#: src/service/transport/gnunet-transport.c:621
 msgid "Disconnected from"
 msgstr "Прекинута је веза са"
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/transport/gnunet-transport.c:654
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Примих %u бајта од „%s“\n"
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr "Парњак „%s“: %s %s у стању „%s“ све до %s\n"
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/transport/gnunet-transport.c:701
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Парњак „%s“: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1103
+#: src/service/transport/gnunet-transport.c:1103
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 "Клијент праћења је ископчан са аур услуге, покушавам поново да се повежем.\n"
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/transport/gnunet-transport.c:1199
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr "Дато је више радњи. Изаберите само једну од: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/transport/gnunet-transport.c:1214
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr "Није дата радња. Изаберите једну од: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1242
+#: src/service/transport/gnunet-transport.c:1242
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Нисам успео да се повежем са услугом преноса\n"
 
-#: src/transport/gnunet-transport.c:1248
+#: src/service/transport/gnunet-transport.c:1248
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
 msgid "Failed to connect to transport service\n"
 msgstr "Нисам успео да се повежем са услугом преноса\n"
 
-#: src/transport/gnunet-transport.c:1301
+#: src/service/transport/gnunet-transport.c:1301
 msgid "Starting to receive benchmark data\n"
 msgstr "Почињем да примам податке оцењивања\n"
 
-#: src/transport/gnunet-transport.c:1367
+#: src/service/transport/gnunet-transport.c:1367
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "исписује податке за све парњаке (уместо само о повезаним парњацима )"
 
-#: src/transport/gnunet-transport.c:1373
+#: src/service/transport/gnunet-transport.c:1373
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "мери колико брзо примамо податке са свих парњака (све до КТРЛ-Ц)"
 
-#: src/transport/gnunet-transport.c:1377
+#: src/service/transport/gnunet-transport.c:1377
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "прекида везу са парњаком"
 
-#: src/transport/gnunet-transport.c:1383
+#: src/service/transport/gnunet-transport.c:1383
 msgid "provide information about all current connections (once)"
 msgstr "обезбеђује податке о свим тренутним везама (једном)"
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/transport/gnunet-transport.c:1395
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "обезбеђује податке о свим догађајима повезивања и прекида везе (непрекидно)"
 
-#: src/transport/gnunet-transport.c:1399
+#: src/service/transport/gnunet-transport.c:1399
 msgid "do not resolve hostnames"
 msgstr "не разрешава називе домаћина"
 
-#: src/transport/gnunet-transport.c:1404
+#: src/service/transport/gnunet-transport.c:1404
 msgid "peer identity"
 msgstr "идентитет парњака"
 
-#: src/transport/gnunet-transport.c:1408
+#: src/service/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
+#: src/service/transport/gnunet-transport.c:1414
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "шаље податке за оцењивање другим парњацима (све до КТРЛ-Ц)"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/service/transport/gnunet-transport.c:1426
 msgid "Direct access to transport service."
 msgstr "Непосредан приступ услузи преноса."
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
-#: src/transport/transport_api2_communication.c:761
+#: src/service/transport/transport_api2_communication.c:761
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Грешка при читању „%s“: %s"
-
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr "Крај датотеке"
-
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Грешка при читању „%s“: %s"
-
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
-
-#: src/util/bio.c:312
-#, fuzzy, c-format
-msgid "Invalid handle type while reading `%s'"
-msgstr "Неисправан аргумент линије наредби „%s“\n"
-
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
-msgstr ""
-
-#: src/util/bio.c:345
-#, c-format
-msgid "%s (while reading `%s')"
-msgstr ""
-
-#: src/util/bio.c:350
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr "Грешка читања дужине ниске „%s“"
-
-#: src/util/bio.c:363
-#, fuzzy, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
-msgstr "Ниска „%s“ је дужа од дозвољеног (%u > %u)"
-
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Грешка писања „HELLO“-а у датотеку „%s“: %s\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
-
-#: src/util/bio.c:773
-#, fuzzy, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr "Неисправан формат времена „%s“\n"
-
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
-msgstr ""
-
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
-msgstr "Потребан је не-празан назив домаћина за услугу „%s“.\n"
-
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:910
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "Порука „%.*s“ је поновљена %u пута у прошлости %s\n"
-
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "ГРЕШКА"
-
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "УПОЗОРЕЊЕ"
-
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
-msgstr ""
-
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "ПОДАЦИ"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "ПРОЧИШЋАВАЊЕ"
-
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr "НИШТА"
-
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr "НЕИСПРАВНО"
-
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr "непозната адреса"
-
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr "неисправна адреса"
-
-#: src/util/common_logging.c:1416
-#, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "Подешавање није успело да наведе опцију „%s“ у одељку „%s“!\n"
-
-#: src/util/common_logging.c:1431
-#, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
-msgstr ""
-"Подешавање наводи неисправну вредност за опцију „%s“ у одељку „%s“: %s\n"
-
-#: src/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "Нисам успео да уклоним датотеку подешавања „%s“\n"
-
-#: src/util/configuration.c:1718
-msgid "Not a valid relative time specification"
-msgstr ""
-
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
-"Вредност подешавања '%s' за '%s' у одељку '%s' није ус купу исправних "
-"избора\n"
-
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:148
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "аргумент „--section“ је потребан\n"
-
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr "аргумент „--option“ је потребан за постављање вредности\n"
-
-#: src/util/configuration_helper.c:263
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Нисам успео да учитам подешавање за „%s“\n"
-
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
-"Величина датотеке на диску није тачна за овај Блум филтер (желим %llu, имам "
-"%llu)\n"
-
-#: src/util/crypto_ecc.c:554
-#, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "„ECC“ потписивање није успело на %s:%d: %s\n"
-
-#: src/util/crypto_ecc.c:677
-#, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
-
-#: src/util/crypto_ecc_setup.c:282
-msgid "Could not load peer's private key\n"
-msgstr "Не могу да учитам лични кључ парњака\n"
-
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "„libgcrypt“ није очекиваног издања (издање %s је потребно).\n"
-
-#: src/util/crypto_rsa.c:908
-#, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "„EdDSA“ потписивање није успело на %s:%d: %s\n"
-
-#: src/util/crypto_rsa.c:1208
-#, fuzzy, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "Провера „ECDSA“ потписа није успела на %s:%d: %s\n"
-
-#: src/util/disk.c:843
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "Очекивах да „%s“ буде директоријум!\n"
-
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Не могу да добијем податке о кориснику „%s“: %s\n"
-
-#: src/util/dnsparser.c:910
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "Нисам успео да претворим УТФ-8 назив „%s“ у ДНС ИДНА формат: %s\n"
-
-#: src/util/dnsstub.c:228
-#, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Не могу да се вежем ни за један прикључник: %s\n"
-
-#: src/util/dnsstub.c:371
-#, fuzzy, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
-msgstr "Примих ДНС одговор који је премали (%u бајта)"
-
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Нисам успео да пошаљем ДНС захтев за %s\n"
-
-#: src/util/dnsstub.c:509
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "Послао сам ДНС захтев за %s\n"
-
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: опција „%s“ је нејасна\n"
-
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
-
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
-
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: опција „%s“ захтева аргумент\n"
-
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: непрепозната опција „--%s“\n"
-
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: непрепозната опција „%c%s“\n"
-
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: недозвољена опција —— %c\n"
-
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: неисправна опција —— %c\n"
-
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: опција захтева аргумент —— %c\n"
-
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ је нејасна\n"
-
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
-
-#: src/util/getopt.c:971
-#, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Употребите „%s“ да добавите списак опција.\n"
-
-#: src/util/getopt.c:984
-#, fuzzy, c-format
-msgid "Option `%s' can't be used with other options.\n"
-msgstr "Опција „%s“ нема смисла без опције „%s“.\n"
-
-#: src/util/getopt.c:996
-#, fuzzy, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr "Недостаје опција „%s“ за радњу „%s“\n"
-
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
-msgstr ""
-
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Аргументи обавезни за дуге опције су такође обавезни за кратке опције.\n"
-
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
-msgstr ""
-
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
-msgstr ""
-
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
-
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:463
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "ствара јединствене датотеке подешавања"
-
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Морате да проследите број опцији „%s“.\n"
-
-#: src/util/getopt_helpers.c:571
-#, fuzzy, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
-msgstr "Морате да проследите релативно време опцији „%s“.\n"
-
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
-msgstr ""
-
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
-msgstr ""
-
-#: src/util/getopt_helpers.c:632
-#, c-format
-msgid "You must pass relative time to the `%s' option.\n"
-msgstr "Морате да проследите релативно време опцији „%s“.\n"
-
-#: src/util/getopt_helpers.c:686
-#, fuzzy, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr "Морате да проследите релативно време опцији „%s“.\n"
-
-#: src/util/getopt_helpers.c:743
-#, fuzzy, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
-msgstr "Морате да проследите број опцији „%s“.\n"
-
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:806
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:876
-#, fuzzy, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr "Морате да проследите број опцији „%s“.\n"
-
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
-msgstr ""
-
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
-msgstr ""
-
-#: src/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
-msgstr "Управља ГНУнет датотекама подешавања"
-
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:95
-#, c-format
-msgid "Failed to open `%s': %s\n"
-msgstr "Нисам успео да отворим „%s“: %s\n"
-
-#: src/util/gnunet-ecc.c:129
-#, fuzzy, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr "Стварам %u кључа, сачекајте"
-
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
-msgstr "Стварам %u кључа, сачекајте"
-
-#: src/util/gnunet-ecc.c:178
-#, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
-msgstr ""
-"\n"
-"Нисам успео да пишем у „%s“: %s\n"
-
-#: src/util/gnunet-ecc.c:185
-#, c-format
-msgid ""
-"\n"
-"Finished!\n"
-msgstr ""
-"\n"
-"Завршено!\n"
-
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
-msgstr ""
-"\n"
-"Грешка, %u кључа нису створена\n"
-
-#: src/util/gnunet-ecc.c:304
-#, c-format
-msgid "Hostkeys file `%s' not found\n"
-msgstr "Нисам нашао датотеку кључа домаћина „%s“\n"
-
-#: src/util/gnunet-ecc.c:314
-#, c-format
-msgid "Hostkeys file `%s' is empty\n"
-msgstr "Датотека кључа домаћина „%s“ је празна\n"
-
-#: src/util/gnunet-ecc.c:334
-#, c-format
-msgid "Could not read hostkey file: %s\n"
-msgstr "Не могу да прочитам датотеку кључа домаћина: %s\n"
-
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr "Није наведена датотека кључа домаћина на линији наредби\n"
-
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
-msgstr "исписује кључеве укључене у датотеци (за тестирање)"
-
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
-msgstr "број кључева за испис укључених у датотеци (за тестирање)"
-
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
-msgstr "ствара БРОЈ пара јавног-личног кључа (за тестирање)"
-
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
-msgstr "исписује јавни кључ у АСКРИ формату"
-
-#: src/util/gnunet-ecc.c:474
-#, fuzzy
-msgid "print the private key in ASCII format"
-msgstr "исписује јавни кључ у АСКРИ формату"
-
-#: src/util/gnunet-ecc.c:479
-#, fuzzy
-msgid "print the public key in HEX format"
-msgstr "исписује јавни кључ у АСКРИ формату"
-
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
-msgstr "исписује примере ЕЦЦ операција (користи се за тестирање сагласности)"
-
-#: src/util/gnunet-ecc.c:499
-msgid "Manipulate GNUnet private ECC key files"
-msgstr "Управља ГНУнет датотекама личног ЕЦЦ кључа"
-
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Нисам успео да обрадим УРИ: %s\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "Неисправан УРИ „%s“\n"
-
-#: src/util/gnunet-qr.c:161
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
-msgstr "Неисправна путања: не почиње са „%s“\n"
-
-#: src/util/gnunet-qr.c:171
-#, fuzzy, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
-msgstr "Неисправна путања: није успело навођење подсистема\n"
-
-#: src/util/gnunet-qr.c:182
-#, fuzzy, c-format
-msgid "No known handler for subsystem `%s'\n"
-msgstr "Није познат руковалац за подсистем „%s“\n"
-
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "Не могу да обрадим ИПв4 адресу „%s“\n"
-
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "Нисам успео да отворим „%s“: %s\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "Покрећем %s...\n"
-
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
-#, c-format
-msgid "Got %d images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
-#, c-format
-msgid "Found %s: \"%s\"\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "„%s“ није ГНУнет директоријум\n"
-
-#: src/util/gnunet-qr.c:546
-#, fuzzy
-msgid "No data found\n"
-msgstr "нисам нашао „upnpc“\n"
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
-msgstr ""
-
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
-msgstr ""
-
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
-msgstr "обавља повратну претрагу"
-
-#: src/util/gnunet-resolver.c:183
-#, fuzzy
-msgid "Use built-in GNUnet stub resolver"
-msgstr "Користи уграђеног заменског решавача ГНУнет-а"
-
-#: src/util/gnunet-scrypt.c:215
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Учитавање кључа домаћина из „%s“ није успело.\n"
-
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
-msgstr "број битова за тражење доказивања о раду"
-
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
-msgstr "датотека са личним кључем, у супротном користи се основна"
-
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
-msgstr "датотека са доказом о раду, у супротном користи се основна"
-
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
-msgstr "време за чекање између прорачуна"
-
-#: src/util/gnunet-scrypt.c:313
-msgid "Manipulate GNUnet proof of work files"
-msgstr "Управља ГНУнет датотекама доказа о раду"
-
-#: src/util/gnunet-service-resolver.c:1288
+#: src/service/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
-msgstr "Није наведена путања на линији наредби\n"
-
-#: src/util/gnunet-uri.c:95
-#, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "Неисправна путања: не почиње са „%s“\n"
-
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr "Неисправна путања: није успело навођење подсистема\n"
-
-#: src/util/gnunet-uri.c:109
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr "Није познат руковалац за подсистем „%s“\n"
-
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
-msgstr "Обавља основне радње за путање ГНУнет-а"
-
-#: src/util/helper.c:304
-#, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "Грешка читања из „%s“: %s\n"
-
-#: src/util/helper.c:356
-#, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "Нисам успео да обрадим долазну поруку са помоћника „%s“\n"
-
-#: src/util/helper.c:571
-#, c-format
-msgid "Error writing to `%s': %s\n"
-msgstr "Грешка писања у „%s“: %s\n"
-
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
-msgstr ""
-"Не могу да скратим јуникс путању „%s“ док задржавам назив јединственим\n"
-
-#: src/util/network.c:1284
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
-"Кобна унутрашња логичка грешка, процес се заплео у „%s“ (прекините са КТРЛ-"
-"Ц)!\n"
-
-#: src/util/os_installation.c:416
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr ""
-"Не могу да одредим путању инсталирања за „%s“.  Поставите „%s“ променљиву "
-"окружења.\n"
-
-#: src/util/os_installation.c:787
-#, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Не могу да нађем извршну „%s“ у ПУТАЊИ!\n"
-
-#: src/util/os_installation.c:820
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Покретање механизма прикључка није успело: %s!\n"
-
-#: src/util/plugin.c:158
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "„%s“ није успело да реши метод '%s' са грешком: %s\n"
-
-#: src/util/plugin.c:215
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "„%s“ није успело за библиотеку '%s' са грешком: %s\n"
-
-#: src/util/plugin.c:371
-msgid "Could not determine plugin installation path.\n"
-msgstr "Не могу да одредим путању инсталирања прикључка.\n"
-
-#: src/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "Лоше подешавање, излазим ...\n"
-
-#: src/util/regex.c:123
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr "Лоша маска: %d\n"
-
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:243
-#, fuzzy, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
-msgstr ""
-"Морате навести „%s“ или бројевну ИП адресу за „%s“ од „%s“ у подешавањима!\n"
-
-#: src/util/resolver_api.c:888
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Истекло је време при покушају решавања назива домаћина „%s“.\n"
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "Истекло је време при покушају решавања ИП адресе „%s“.\n"
-
-#: src/util/resolver_api.c:1086
-#, fuzzy
-msgid "Resolver not configured correctly.\n"
-msgstr "Основна услуга „%s“ није подешена исправно!\n"
-
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr "Не могу да решим наш „FQDN“ : %s\n"
-
-#: src/util/service.c:654
-#, fuzzy, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
-msgstr ""
-"Обрађивачки код за поруку врсте %u није позвао „GNUNET_SERVER_receive_done“ "
-"након „%s“\n"
-
-#: src/util/service.c:838
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr "Непозната породица адресе „%d“\n"
-
-#: src/util/service.c:951
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr "Не могу да обрадим спецификацију ИПв4 мреже „%s“ за `%s:%s'\n"
-
-#: src/util/service.c:992
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr "Не могу да обрадим спецификацију ИПв6 мреже „%s“ за `%s:%s'\n"
-
-#: src/util/service.c:1401
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "„%s“ није успело за прикључник %d (%s).\n"
-
-#: src/util/service.c:1413
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "„%s“ није успело за прикључник %d (%s): адреса је већ у употреби\n"
-
-#: src/util/service.c:1420
-#, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "„%s“ није успело за „%s“: адреса је већ у употреби\n"
-
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr "Наведена вредност за „%s“ услуге „%s“ је неисправна\n"
-
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-"Не могу да приступим унапред свезаној прикључници %u, покушаћу да свежем "
-"себе самог\n"
-
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr "Нема таквог корисника"
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Не могу да променим власника/групу на „%s“: %s\n"
-
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
-msgstr "Процес услуге није успео да се покрене\n"
-
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
-msgstr "Процес услуге не може да покрене функцију сервера\n"
-
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
-msgstr "Процес услуге није успео да извести о стању\n"
-
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
-msgstr "ради демонизацију (откачиње од терминала)"
-
-#: src/util/service.c:2099
-msgid "Malformed configuration, exit ...\n"
-msgstr "Лоше подешавање, излазим ...\n"
-
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
-msgstr ""
-
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
-msgstr "Скупови знакова се захтевају где је „%s“–>„%s“\n"
-
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-"Нисам успео да раширим „$HOME“: променљива окружења „HOME“ није постављена"
-
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
-msgstr "ИПв6 адреса не почиње са [\n"
-
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
-msgstr "ИПв6 адреса садржи : за раздвајање броја прикључника\n"
-
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr "ИПв6 адреса садржи ] пре : за раздвајање броја прикључника\n"
-
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr "ИПв6 адреса садржи исправан број прикључника након последње „:“\n"
-
-#: src/util/strings.c:1081
-#, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "Неисправна ИПв6 адреса „%s“: %s\n"
-
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
-msgstr "Прикључник није у опсегу\n"
-
-#: src/util/strings.c:1283
-#, c-format
-msgid "Malformed port policy `%s'\n"
-msgstr "Лоша политика прикључника „%s“\n"
-
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Неисправан формат за ИП: „%s“\n"
-
-#: src/util/strings.c:1408
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Неисправна напомена мреже („/%d“ није исправно у ИПв4 ЦИДР-у)."
-
-#: src/util/strings.c:1459
-#, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Неисправан формат: „%s“\n"
-
-#: src/util/strings.c:1501
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Неисправна напомена мреже (не завршава се са „;“: „%s“)\n"
-
-#: src/util/strings.c:1551
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Погрешан формат „%s“ за мрежну маску\n"
-
-#: src/util/strings.c:1582
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Погрешан формат „%s“ за мрежу\n"
-
-#: src/util/time.c:901 src/util/time.c:929
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/util/time.c:937
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr "# Активни канали"
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# Бајтови су одбачени у реду меша (прекорачење)"
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# ИЦМП пакети су примљени од меша"
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# УДП пакети су примљени од меша"
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# ТЦП пакети су примљени од меша"
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# Меш канали су направљени"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Протокол %u није подржан, одбацујем\n"
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# ICMP пакет је одбачен (није дозвољен)"
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# ICMPv4 пакети су одбачени (нису дозвољени)"
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# ICMPv6 пакети су одбачени (нису дозвољени)"
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr "# Пакети су примљени са ТУН сучеља"
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Пакет је примљен за одмапирано одредиште „%s“ (одбацујем га)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Примљен је ИПв4 пакет са опцијама (одбацујем га)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Примљен је пакет непознатог протокола %d са ТУН-а (одбацујем га)\n"
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "Нисам успео да нађем недодељену ИПв4 адресу у опсегу ВПН-а\n"
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Нисам успео да нађем недодељену ИПв6 адресу у опсегу ВПН-а\n"
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr "# Активна одредишта"
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr "Нисам успео да доделим ИП адресу за ново одредиште\n"
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 msgid "Must specify valid IPv6 address"
 msgstr "Морате навести исправну ИПв6 адресу"
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr "Морате навести исправну ИПв6 маску"
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr "ИПв6 подршка је искључена јер овај систем не подржава ИПв6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 msgid "Must specify valid IPv4 address"
 msgstr "Морате навести исправну ИПв4 адресу"
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr "Морате навести исправну ИПв4 маску"
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr "ИПв4 подршка је искључена јер овај систем не подржава ИПв4\n"
 
-#: src/vpn/gnunet-vpn.c:142
-msgid "Error creating tunnel\n"
-msgstr "Грешка стварања тунела\n"
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr "Опција „%s“ нема смисла са опцијом „%s“.\n"
-
-#: src/vpn/gnunet-vpn.c:202
-#, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "Опција „%s“ или „%s“ је потребна.\n"
-
-#: src/vpn/gnunet-vpn.c:216
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr "Опција „%s“ или „%s“ се захтева приликом коришћења опције „%s“.\n"
-
-#: src/vpn/gnunet-vpn.c:239
-#, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "„%s“ није исправан одредник парњака.\n"
-
-#: src/vpn/gnunet-vpn.c:258
-#, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "„%s“ није исправна ИП адреса.\n"
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr "захтева да резултат треба да буде ИПв4 адреса"
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr "захтева да резултат треба да буде ИПв6 адреса"
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr "колико дуго мапирање треба бити важеће за нове тунеле?"
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr "ИП одредишта за тунел"
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr "парњак који нуди услугу којој желимо да приступимо"
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr "назив услуге којој желимо да приступимо"
-
-#: src/vpn/gnunet-vpn.c:334
-msgid "service is offered via TCP"
-msgstr "услуга се нуди путем ТЦП-а"
-
-#: src/vpn/gnunet-vpn.c:339
-msgid "service is offered via UDP"
-msgstr "услуга се нуди путем УДП-ом"
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr "Поставља тунеле путем ВПН-а."
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Нисам успео да реплицирам блок у остави назива: %s\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 msgid "Failed to connect to the namestore!\n"
 msgstr "Нисам успео да се повежем са смештајем назива!\n"
 
 #, fuzzy
+#~ msgid "Expired HELLO encountered (ignored)"
+#~ msgstr "наиђох на „HELLO“-е без адреса (занемарено)"
+
+#, fuzzy
 #~ msgid ""
 #~ "how many peers (random selection without replacement) receive one value?"
 #~ msgstr "колико парњака прима једну вредност?"
diff --git a/po/sv.po b/po/sv.po
index 4f2969de6..dbddf76d6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,586 +16,2501 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, fuzzy, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/abd/gnunet-abd.c:566
-#, fuzzy
-msgid "Ego does not exist!\n"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, fuzzy, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, c-format
-msgid "ego required\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, fuzzy, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-#, fuzzy
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr "ange prioritet för innehållet"
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-#, fuzzy
-msgid "The public key of the authority to verify the credential against"
-msgstr "ange prioritet för innehållet"
-
-#: src/abd/gnunet-abd.c:1030
-#, fuzzy
-msgid "The ego/zone name to use"
-msgstr "meddelandestorlek"
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-#, fuzzy
-msgid "GNUnet abd resolver tool"
-msgstr "Spåra GNUnets nätverkstopologi."
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 #, fuzzy
 msgid "is started already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/cli/cadet/gnunet-cadet.c:685
 #, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:746
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cli/cadet/gnunet-cadet.c:775
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Samling stoppad.\n"
+
+#: src/cli/cadet/gnunet-cadet.c:800
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:817
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/cadet/gnunet-cadet.c:827
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr "# av anslutna parter"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:99
+#, fuzzy
+msgid "key received"
+msgstr "# sessionnycklar vägrade"
+
+#: src/cli/core/gnunet-core.c:103
+#, fuzzy
+msgid "connection established"
+msgstr "Samling stoppad.\n"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/cli/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "Okänt fel"
+
+#: src/cli/core/gnunet-core.c:129
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/core/gnunet-core.c:157
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Ogiltiga kommandoradsargument:\n"
+
+#: src/cli/core/gnunet-core.c:163
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+#, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/core/gnunet-core.c:196
+#, fuzzy
+msgid "Print information about connected peers."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/datastore/gnunet-datastore.c:187
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
+#: src/cli/datastore/gnunet-datastore.c:257
 #, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
+msgid "Error queueing datastore GET operation\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/cli/datastore/gnunet-datastore.c:319
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/cli/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:378
+#, fuzzy, c-format
+msgid "Error queueing datastore PUT operation\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/datastore/gnunet-datastore.c:454
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:477
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#: src/cli/datastore/gnunet-datastore.c:482
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# byte krypterade"
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:498
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
+#: src/cli/dht/gnunet-dht-get.c:167
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Result %d, type %d:\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Failed to connect to DHT service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/dht/gnunet-dht-get.c:256
+msgid "Issuing DHT GET with key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
+#: src/cli/dht/gnunet-dht-put.c:140
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
+msgid "Could not connect to DHT service!\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:951
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
+msgid "Failed to load state: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:962
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
 #, fuzzy, c-format
-msgid "Starting service `%s'\n"
+msgid "Failed to save state to file %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/cli/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:480
+#, fuzzy, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/cli/fs/gnunet-auto-share.c:491
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:661
+#, fuzzy, c-format
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr "ange prioritet för innehållet"
+
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:54
+#, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:106
+#, fuzzy, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Katalog \"%s\":\n"
+
+#: src/cli/fs/gnunet-directory.c:109
+#, fuzzy, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "==> Katalog \"%s\":\n"
+
+#: src/cli/fs/gnunet-directory.c:146
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "Du måste ange en lista av filer att lägga in.\n"
+
+#: src/cli/fs/gnunet-directory.c:160
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/cli/fs/gnunet-directory.c:170
+#, fuzzy, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/cli/fs/gnunet-directory.c:201
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/cli/fs/gnunet-download.c:131
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1062
+#: src/cli/fs/gnunet-download.c:143
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Okänt fel"
+
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:177
 #, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Kunde inte skapa användarkonto:"
+msgid "Error downloading: %s.\n"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/cli/fs/gnunet-download.c:189
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Uppladdning vägrades!"
 
-#: src/arm/gnunet-service-arm.c:1093
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Unexpected status: %d\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:234
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
+
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1124
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
+msgstr "skriv filen till FILNAMN"
+
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
+msgstr "hämta en GNUnet-katalog rekursivt"
+
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/cli/fs/gnunet-fs.c:180
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Visa alla alternativ"
+
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/fs/gnunet-publish.c:247
 #, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Error publishing: %s.\n"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/cli/fs/gnunet-publish.c:255
+#, c-format
+msgid "Publishing `%s' done.\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/fs/gnunet-publish.c:259
 #, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
+msgid "URI is `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/cli/fs/gnunet-publish.c:280
+#, fuzzy
+msgid "Starting cleanup after abort\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/cli/fs/gnunet-publish.c:287
+#, fuzzy
+msgid "Cleanup after abort completed.\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/cli/fs/gnunet-publish.c:292
+#, fuzzy
+msgid "Cleanup after abort failed.\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/cli/fs/gnunet-publish.c:426
+#, fuzzy, c-format
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
+
+#: src/cli/fs/gnunet-publish.c:428
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "Nyckelord för fil \"%s\":\n"
+
+#: src/cli/fs/gnunet-publish.c:583
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/cli/fs/gnunet-publish.c:612
+#, fuzzy
+msgid "Could not start publishing.\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/cli/fs/gnunet-publish.c:645
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/cli/fs/gnunet-publish.c:647
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
+#: src/cli/fs/gnunet-publish.c:653
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
+#: src/cli/fs/gnunet-publish.c:659
+#, fuzzy
+msgid "Preprocessing complete.\n"
+msgstr "Nedstängning klar.\n"
+
+#: src/cli/fs/gnunet-publish.c:665
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
+
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1765
+#: src/cli/fs/gnunet-publish.c:679
 #, fuzzy
-msgid "unknown"
-msgstr "Okänt fel"
+msgid "Error scanning directory.\n"
+msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/fs/gnunet-publish.c:706
 #, fuzzy, c-format
-msgid "Service `%s' took %s to terminate\n"
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
+
+#: src/cli/fs/gnunet-publish.c:738
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:811
+#, c-format
+msgid "Cannot extract metadata from a URI!\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:818
+#, 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/cli/fs/gnunet-publish.c:824
+#, 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/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
+#, fuzzy, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:907
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:928
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:953
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:965
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:972
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:980
+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/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:446
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:535
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "Fel vid lämning av DHT.\n"
+
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:629
+#, fuzzy
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:662
+#, fuzzy, c-format
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/cli/fs/gnunet-search.c:676
+#, fuzzy
+msgid "Could not start searching.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/cli/fs/gnunet-search.c:702
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:789
+msgid "Search for files that have been published on GNUnet\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:103
+#, fuzzy, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+"\n"
+"Fel vid avindexering av fil: %s\n"
+
+#: src/cli/fs/gnunet-unindex.c:109
+#, fuzzy
+msgid "Unindexing done.\n"
+msgstr "Avindexera filer."
+
+#: src/cli/fs/gnunet-unindex.c:142
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
+
+#: src/cli/fs/gnunet-unindex.c:162
+#, fuzzy
+msgid "Could not start unindex operation.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:345
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/cli/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
+#: src/cli/identity/gnunet-identity.c:225
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:551
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:576
+msgid "reduce output"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:597
+msgid "display private keys as well"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:105
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:174
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "anger vilken TRANSPORT som ska testas"
+
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cli/namecache/gnunet-namecache.c:187
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "Du måste ange en mottagare!\n"
+
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:220
+#, fuzzy
+msgid "specifies the public key of the zone to look in"
+msgstr "ange prioritet för innehållet"
+
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet-konfiguration"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
+#, fuzzy, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr "Onödiga argument (ignorerade).\n"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "GNUnet-konfiguration"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, fuzzy, c-format
+msgid "Data `%s' invalid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "Visa värde av alternativet"
+
+#: src/cli/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1302
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1327
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1356
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1370
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1381
+#, fuzzy
+msgid "name"
+msgstr "Visa namn"
+
+#: src/cli/namestore/gnunet-namestore.c:1410
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1471
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, fuzzy, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2004
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2010
+#, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/namestore/gnunet-namestore.c:2015
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:2025
+#, fuzzy
+msgid "Output in recordline format"
+msgstr "utdata i gnuplot-format"
+
+#: src/cli/namestore/gnunet-namestore.c:2031
+#, fuzzy
+msgid "determine our name for the given KEY"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2056
+msgid "omit private records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "GNUnet-konfiguration"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "write configuration file (for autoconfiguration)"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "GNUnet-konfiguration"
+
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:124
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# byte mottogs via TCP"
+
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:852
+#, fuzzy
+msgid "The EGO to use"
+msgstr "meddelandestorlek"
+
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:150
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/revocation/gnunet-revocation.c:154
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Okänt fel.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:180
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/revocation/gnunet-revocation.c:183
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/cli/revocation/gnunet-revocation.c:189
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
+#: src/cli/revocation/gnunet-revocation.c:334
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#: src/cli/revocation/gnunet-revocation.c:350
+#, fuzzy, c-format
+msgid "Error: Key is invalid\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:187
+#: src/cli/revocation/gnunet-revocation.c:424
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/cli/revocation/gnunet-revocation.c:434
 msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
-msgid "public auction outcome"
+#: src/cli/revocation/gnunet-revocation.c:464
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/cli/revocation/gnunet-revocation.c:481
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
+
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:558
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "antal iterationer"
+
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
-msgstr "Ogiltiga argument: "
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/statistics/gnunet-statistics.c:577
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/statistics/gnunet-statistics.c:589
 #, fuzzy, c-format
-msgid "Invalid target `%s'\n"
+msgid "Failed to initialize watch routine\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/cli/statistics/gnunet-statistics.c:725
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:775
+#: src/cli/statistics/gnunet-statistics.c:742
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/cli/statistics/gnunet-statistics.c:751
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:783
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
+msgstr "Skriv ut statistik om GNUnet-operationer."
+
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:192
 #, fuzzy
-msgid "No action requested\n"
-msgstr "Samling stoppad.\n"
+msgid "Manipulate GNUnet configuration files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:95
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/cli/util/gnunet-ecc.c:129
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:178
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/cli/util/gnunet-ecc.c:185
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Finished!\n"
+msgstr "Slutför"
+
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:304
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#: src/cli/util/gnunet-ecc.c:314
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:334
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:479
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:800
+#: src/cli/util/gnunet-ecc.c:499
 #, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "Ogiltiga argument: "
+
+#: src/cli/util/gnunet-qr.c:161
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/cli/util/gnunet-qr.c:171
+#, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/util/gnunet-qr.c:182
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
+#: src/cli/util/gnunet-qr.c:218
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/cli/util/gnunet-qr.c:261
 #, fuzzy
-msgid "Provide information about a patricular peer"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Capturing...\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
+#, fuzzy, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/cli/util/gnunet-qr.c:546
 #, fuzzy
-msgid "Provide information about all peers"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "No data found\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:183
+msgid "Use built-in GNUnet stub resolver"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:215
+#, fuzzy, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
+
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:827
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:313
 #, fuzzy
-msgid "Provide information about all tunnels"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Manipulate GNUnet proof of work files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:95
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:142
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/cli/vpn/gnunet-vpn.c:202
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
+#: src/cli/vpn/gnunet-vpn.c:216
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+
+#: src/cli/vpn/gnunet-vpn.c:239
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "\"%s\" är inte en vanlig fil.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:258
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:334
+#, fuzzy
+msgid "service is offered via TCP"
+msgstr "# byte mottogs via TCP"
+
+#: src/cli/vpn/gnunet-vpn.c:339
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# byte mottagna via UDP"
+
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:890
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:983
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1011
+#, fuzzy
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr "ange prioritet för innehållet"
+
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1025
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "ange prioritet för innehållet"
+
+#: src/contrib/service/abd/gnunet-abd.c:1030
+#, fuzzy
+msgid "The ego/zone name to use"
+msgstr "meddelandestorlek"
+
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1098
+#, fuzzy
+msgid "GNUnet abd resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
 msgid ""
 "\n"
@@ -603,7065 +2518,5232 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/contrib/service/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
+#: src/contrib/service/conversation/gnunet-conversation.c:287
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/contrib/service/conversation/gnunet-conversation.c:356
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
+#: src/contrib/service/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
+#: src/contrib/service/conversation/gnunet-conversation.c:398
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
+#: src/contrib/service/conversation/gnunet-conversation.c:548
 #, c-format
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:607
+#: src/contrib/service/conversation/gnunet-conversation.c:607
 #, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/contrib/service/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/contrib/service/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/contrib/service/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/contrib/service/conversation/gnunet-conversation.c:680
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/contrib/service/conversation/gnunet-conversation.c:696
 #, c-format
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/contrib/service/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/contrib/service/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:728
+#: src/contrib/service/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/contrib/service/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
+#: src/contrib/service/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/contrib/service/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/contrib/service/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/contrib/service/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/contrib/service/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/contrib/service/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/contrib/service/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/contrib/service/conversation/gnunet-conversation.c:958
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/contrib/service/conversation/gnunet-conversation.c:961
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/contrib/service/conversation/gnunet-conversation.c:964
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1124
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1134
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1166
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1193
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# av anslutna parter"
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "# av anslutna parter"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:504
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:509
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:703
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
 #, fuzzy
 msgid "ogg_stream_init() failed.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/conversation/microphone.c:118
+#: src/contrib/service/conversation/microphone.c:118
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, c-format
 msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/speaker.c:73
+#: src/contrib/service/conversation/speaker.c:73
 #, fuzzy
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/gnunet-core.c:91
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
 #, fuzzy
-msgid "fresh connection"
-msgstr "# av anslutna parter"
+msgid "number of peers to start"
+msgstr "antal iterationer"
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
 #, fuzzy
-msgid "key received"
-msgstr "# sessionnycklar v��grade"
+msgid "timeout for the profiling"
+msgstr "ange prioritet f��r innehållet"
 
-#: src/core/gnunet-core.c:103
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
 #, fuzzy
-msgid "connection established"
-msgstr "Samling stoppad.\n"
+msgid "number of PeerIDs to request"
+msgstr "antal iterationer"
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "Kan inte tillgå tjänsten"
+
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/core/gnunet-core.c:111
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
-msgid "disconnected"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/core/gnunet-core.c:120
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/core/gnunet-core.c:124
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
 #, fuzzy
-msgid "unknown state"
+msgid "Connect to CADET failed\n"
+msgstr " Anslutning misslyckades (fel?)\n"
+
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
+#, fuzzy
+msgid "number of peers in consensus"
+msgstr "antal iterationer"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "antal iterationer"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "antal iterationer"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+#, fuzzy
+msgid "number of values"
+msgstr "antal iterationer"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
+msgid "No error (success)."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
+#, fuzzy
+msgid "Unknown and unspecified error."
 msgstr "Okänt fel"
 
-#: src/core/gnunet-core.c:129
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
+#, fuzzy
+msgid "Ego not found."
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Okänt fel"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# sessionsnycklar accepterade"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
+#, fuzzy
+msgid "Zone not found."
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
+#, fuzzy
+msgid "Record not found."
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
+#, fuzzy
+msgid "No records given."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
+msgid "Record data invalid."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
+msgid "No label given."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
+#, fuzzy
+msgid "No results given."
+msgstr "# byte mottogs via TCP"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
+msgid "Record already exists."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
+msgid "Label invalid or malformed."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/lib/hello/gnunet-hello.c:310
 #, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:315
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
 #, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Error opening file `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/lib/hello/gnunet-hello.c:339
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/lib/hello/gnunet-hello.c:386
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/lib/hello/gnunet-hello.c:395
+#, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:409
+msgid "Hello file to read"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:418
+#, fuzzy
+msgid "Print information about peers."
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/lib/hello/hello.c:1089
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/lib/hello/hello.c:1099
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/lib/hello/hello.c:1109
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/lib/hello/hello.c:1121
+#, fuzzy
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/lib/hello/hello.c:1139
+#, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1147
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1162
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/lib/sq/sq.c:47
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Fel vid skapandet av användare"
+
+#: src/lib/util/bio.c:241
+#, fuzzy
+msgid "End of file"
+msgstr "Läs in en konfigurationsfil"
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
+msgstr ""
+
+#: src/lib/util/bio.c:312
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:163
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
+
+#: src/lib/util/bio.c:345
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/lib/util/bio.c:350
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr ""
+
+#: src/lib/util/bio.c:363
+#, c-format
+msgid "String `%s' longer than allowed (%u > %lu)"
+msgstr ""
+
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
+msgstr ""
+
+#: src/lib/util/bio.c:773
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:910
+#, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "FEL"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "VARNING"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
+msgstr "MEDDELANDE"
+
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "INFO"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "FELSÖKNING"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1416
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/lib/util/common_logging.c:1431
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
+
+#: src/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/configuration.c:1718
 #, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Not a valid relative time specification"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:148
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:263
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/lib/util/crypto_ecc.c:554
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/lib/util/crypto_ecc.c:677
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
+#: src/lib/util/crypto_ecc_setup.c:282
 #, fuzzy
-msgid "provide information about all current connections (continuously)"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Could not load peer's private key\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
+
+#: src/lib/util/crypto_rsa.c:908
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/lib/util/crypto_rsa.c:1208
+#, fuzzy, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/lib/util/disk.c:843
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#: src/lib/util/dnsparser.c:910
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/lib/util/dnsstub.c:228
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/lib/util/dnsstub.c:371
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)\n"
+msgstr ""
+
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/lib/util/dnsstub.c:509
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/lib/util/getopt.c:566
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
+
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
+
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagga \"%s\" kräver ett argument\n"
+
+#: src/lib/util/getopt.c:648
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
+
+#: src/lib/util/getopt.c:654
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
+
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagga kräver ett argument -- %c\n"
+
+#: src/lib/util/getopt.c:762
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagga \"-W %s\" är tvetydig\n"
+
+#: src/lib/util/getopt.c:782
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
+
+#: src/lib/util/getopt.c:971
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "Använd --help för att få en lista på flaggor.\n"
+
+#: src/lib/util/getopt.c:984
+#, fuzzy, c-format
+msgid "Option `%s' can't be used with other options.\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/core/gnunet-core.c:196
+#: src/lib/util/getopt.c:996
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
+msgstr "skriv ut versionsnummer"
+
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
+"korta flaggor.\n"
+
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
+msgstr "skriv ut denna hjälp"
+
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
+msgstr "var informativ"
+
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:463
 #, fuzzy
-msgid "Print information about connected peers."
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "use configuration file FILENAME"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/lib/util/getopt_helpers.c:571
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/lib/util/getopt_helpers.c:578
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:632
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/lib/util/getopt_helpers.c:686
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/lib/util/getopt_helpers.c:743
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/lib/util/getopt_helpers.c:750
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:876
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/lib/util/getopt_helpers.c:954
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/lib/util/helper.c:304
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/lib/util/helper.c:356
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/lib/util/helper.c:571
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/lib/util/network.c:163
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/lib/util/network.c:1284
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:416
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:787
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#: src/lib/util/os_installation.c:820
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+
+#: src/lib/util/plugin.c:158
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+
+#: src/lib/util/plugin.c:215
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/lib/util/plugin.c:371
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:243
+#, fuzzy, c-format
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
+msgstr ""
+"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion "
+"\"%s\".\n"
+
+#: src/lib/util/resolver_api.c:888
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/lib/util/resolver_api.c:901
+#, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:1086
+msgid "Resolver not configured correctly.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/lib/util/service.c:654
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:838
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+# drive = hard drive ?
+#: src/lib/util/service.c:1401
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/lib/util/service.c:1413
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+
+#: src/lib/util/service.c:1420
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+
+#: src/lib/util/service.c:1481
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/lib/util/service.c:1505
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr ""
+
+#: src/lib/util/service.c:1658
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/lib/util/socks.c:636
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/socks.c:653
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
+
+#: src/lib/util/strings.c:394
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr ""
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1081
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1283
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
+
+#: src/lib/util/strings.c:1459
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/lib/util/strings.c:1551
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Fel format \"%s\" för nätmask: %s\n"
+
+#: src/lib/util/strings.c:1582
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Fel format \"%s\" för nätverk: %s\n"
+
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/lib/util/time.c:937
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+msgid "flat plugin running\n"
+msgstr ""
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+msgid "Sqlite database running\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+msgid "Flat file database running\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+msgid "SQlite database running\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+#, fuzzy
+msgid "OpenID Connect REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+#, fuzzy
+msgid "CONFIG REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/service/arm/gnunet-service-arm.c:391
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:951
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/service/arm/gnunet-service-arm.c:1062
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/service/arm/gnunet-service-arm.c:1093
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1124
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1272
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/service/arm/gnunet-service-arm.c:1604
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1765
+#, fuzzy
+msgid "unknown"
+msgstr "Okänt fel"
+
+#: src/service/arm/gnunet-service-arm.c:1771
+#, fuzzy, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "Tjänst borttagen.\n"
+
+#: src/service/arm/gnunet-service-arm.c:1798
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr ""
 
-#: src/core/gnunet-service-core.c:329
+#: src/service/arm/gnunet-service-arm.c:1815
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
+
+#: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:355
+#: src/service/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/service/core/gnunet-service-core.c:419
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:505
+#: src/service/core/gnunet-service-core.c:505
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core.c:824
+#: src/service/core/gnunet-service-core.c:824
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:926
+#: src/service/core/gnunet-service-core.c:926
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:954
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/core/gnunet-service-core_kx.c:511
+#: src/service/core/gnunet-service-core_kx.c:511
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:569
+#: src/service/core/gnunet-service-core_kx.c:569
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:666
+#: src/service/core/gnunet-service-core_kx.c:666
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:718
+#: src/service/core/gnunet-service-core_kx.c:718
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:774
+#: src/service/core/gnunet-service-core_kx.c:774
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:806
+#: src/service/core/gnunet-service-core_kx.c:806
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:865
+#: src/service/core/gnunet-service-core_kx.c:865
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/service/core/gnunet-service-core_kx.c:880
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/service/core/gnunet-service-core_kx.c:917
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/service/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:962
+#: src/service/core/gnunet-service-core_kx.c:962
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/service/core/gnunet-service-core_kx.c:1072
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1082
+#: src/service/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1134
+#: src/service/core/gnunet-service-core_kx.c:1134
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/service/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1172
+#: src/service/core/gnunet-service-core_kx.c:1172
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/service/core/gnunet-service-core_kx.c:1229
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/service/core/gnunet-service-core_kx.c:1237
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1246
+#: src/service/core/gnunet-service-core_kx.c:1246
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/service/core/gnunet-service-core_kx.c:1288
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1331
+#: src/service/core/gnunet-service-core_kx.c:1331
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1343
+#: src/service/core/gnunet-service-core_kx.c:1343
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1352
+#: src/service/core/gnunet-service-core_kx.c:1352
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/service/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/service/core/gnunet-service-core_kx.c:1537
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/service/core/gnunet-service-core_kx.c:1632
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1679
+#: src/service/core/gnunet-service-core_kx.c:1679
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1689
+#: src/service/core/gnunet-service-core_kx.c:1689
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/service/core/gnunet-service-core_sessions.c:285
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:400
+#: src/service/core/gnunet-service-core_sessions.c:400
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/service/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
 #, fuzzy
 msgid "# type maps received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_typemap.c:217
+#: src/service/core/gnunet-service-core_typemap.c:217
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:492
+#: src/service/datacache/plugin_datacache_heap.c:492
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:340
+#: src/service/datastore/datastore_api.c:340
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/datastore/datastore_api.c:462
+#: src/service/datastore/datastore_api.c:462
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/datastore/datastore_api.c:565
+#: src/service/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:595
+#: src/service/datastore/datastore_api.c:595
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:756
+#: src/service/datastore/datastore_api.c:756
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:810
+#: src/service/datastore/datastore_api.c:810
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:917
+#: src/service/datastore/datastore_api.c:917
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:1007
+#: src/service/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1068
+#: src/service/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1113
+#: src/service/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1171
+#: src/service/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1230
+#: src/service/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1276
+#: src/service/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/service/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:257
-#, fuzzy, c-format
-msgid "Error queueing datastore GET operation\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
-#, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/datastore/gnunet-datastore.c:319
-#, fuzzy, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/datastore/gnunet-datastore.c:331
-#, c-format
-msgid "Inserted %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:378
-#, fuzzy, c-format
-msgid "Error queueing datastore PUT operation\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/datastore/gnunet-datastore.c:454
-#, c-format
-msgid "Please choose at least one operation: %s, %s\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:477
-#, fuzzy
-msgid "Dump all records from the datastore"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/datastore/gnunet-datastore.c:482
-#, fuzzy
-msgid "Insert records into the datastore"
-msgstr "# byte krypterade"
-
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:498
-#, fuzzy
-msgid "Manipulate GNUnet datastore"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/datastore/gnunet-service-datastore.c:335
+#: src/service/datastore/gnunet-service-datastore.c:335
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:419
+#: src/service/datastore/gnunet-service-datastore.c:419
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:551
+#: src/service/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:593
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:612
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:619
+#: src/service/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:693
+#: src/service/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:743
+#: src/service/datastore/gnunet-service-datastore.c:743
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:858
+#: src/service/datastore/gnunet-service-datastore.c:858
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/service/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:899
+#: src/service/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:940
+#: src/service/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:971
+#: src/service/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1012
+#: src/service/datastore/gnunet-service-datastore.c:1012
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1019
+#: src/service/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/service/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/service/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/service/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/service/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/service/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/service/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/service/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/service/datastore/gnunet-service-datastore.c:1573
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/plugin_datastore_heap.c:895
+#: src/service/datastore/plugin_datastore_heap.c:895
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
+#: src/service/datastore/plugin_datastore_postgres.c:811
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/service/datastore/plugin_datastore_sqlite.c:87
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:634
+#: src/service/datastore/plugin_datastore_sqlite.c:634
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
+#: src/service/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "antal iterationer"
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
 #, fuzzy
 msgid "error preparing statement\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
 #, fuzzy
 msgid "error stepping\n"
 msgstr "# byte krypterade"
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-msgid "Sqlite database running\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_template.c:252
+#: src/service/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:167
-#, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, fuzzy, c-format
-msgid "Failed to connect to DHT service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/dht/gnunet-dht-get.c:256
-msgid "Issuing DHT GET with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-msgid "use DHT's record route option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:925
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "antal iterationer"
-
-#: src/dht/gnunet_dht_profiler.c:964
+#: src/service/dht/gnunet_dht_profiler.c:964
 msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:976
+#: src/service/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
+#: src/service/dht/gnunet_dht_profiler.c:982
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
+#: src/service/dht/gnunet_dht_profiler.c:988
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
+#: src/service/dht/gnunet_dht_profiler.c:993
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
+#: src/service/dht/gnunet_dht_profiler.c:999
 msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
+#: src/service/dht/gnunet_dht_profiler.c:1005
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
+#: src/service/dht/gnunet_dht_profiler.c:1026
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:387
+#: src/service/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:240
+#: src/service/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:246
+#: src/service/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:259
+#: src/service/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:463
+#: src/service/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:617
+#: src/service/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:753
+#: src/service/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:829
+#: src/service/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:951
+#: src/service/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:970
+#: src/service/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:993
+#: src/service/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/service/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1066
+#: src/service/dns/gnunet-service-dns.c:1066
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dns/gnunet-service-dns.c:1125
+#: src/service/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/service/exit/gnunet-daemon-exit.c:968
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1074
+#: src/service/exit/gnunet-daemon-exit.c:1074
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1368
+#: src/service/exit/gnunet-daemon-exit.c:1368
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1504
+#: src/service/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/service/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1658
+#: src/service/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1749
+#: src/service/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1837
+#: src/service/exit/gnunet-daemon-exit.c:1837
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1876
+#: src/service/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2017
+#: src/service/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2287
+#: src/service/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/service/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636
+#: src/service/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:2828
+#: src/service/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2837
+#: src/service/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2913
+#: src/service/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2987
+#: src/service/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3036
+#: src/service/exit/gnunet-daemon-exit.c:3036
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3051
+#: src/service/exit/gnunet-daemon-exit.c:3051
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3078
+#: src/service/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/service/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/service/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/service/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/service/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/service/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3661
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3832
+#: src/service/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3948
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4114
+#: src/service/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fs/fs_api.c:481
+#: src/service/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:492
+#: src/service/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:500
+#: src/service/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1157
+#: src/service/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1708
+#: src/service/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1723
+#: src/service/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2452
+#: src/service/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2463
+#: src/service/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2629
+#: src/service/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2847
+#: src/service/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3108
+#: src/service/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:216
+#: src/service/fs/fs_directory.c:216
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:311
+#: src/service/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:333
+#: src/service/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:347
+#: src/service/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:961
+#: src/service/fs/fs_download.c:961
 #, 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:1045
+#: src/service/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1067
+#: src/service/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1090
+#: src/service/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1101
+#: src/service/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1111
+#: src/service/fs/fs_download.c:1111
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1219
+#: src/service/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1890
+#: src/service/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
 
-#: src/fs/fs_getopt.c:237
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:191
+#: src/service/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_misc.c:129
+#: src/service/fs/fs_misc.c:129
 #, fuzzy, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_namespace.c:203
+#: src/service/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:234
+#: src/service/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:331
+#: src/service/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:458
+#: src/service/fs/fs_namespace.c:458
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:732
+#: src/service/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:791
+#: src/service/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:837
+#: src/service/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:857
+#: src/service/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:889
+#: src/service/fs/fs_publish.c:889
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:915
+#: src/service/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/service/fs/fs_publish.c:1108
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:1116
+#: src/service/fs/fs_publish.c:1116
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1157
+#: src/service/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1397
+#: src/service/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/fs/fs_publish.c:1489
+#: src/service/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:213
+#: src/service/fs/fs_publish_ksk.c:213
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish_ublock.c:215
+#: src/service/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:994
+#: src/service/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/service/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:69
+#: src/service/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:276
+#: src/service/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/fs/fs_unindex.c:327
+#: src/service/fs/fs_unindex.c:327
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_unindex.c:386
+#: src/service/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_unindex.c:447
+#: src/service/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:670
+#: src/service/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:709
+#: src/service/fs/fs_unindex.c:709
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:232
+#: src/service/fs/fs_uri.c:232
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:291
+#: src/service/fs/fs_uri.c:291
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:309
+#: src/service/fs/fs_uri.c:309
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:316
+#: src/service/fs/fs_uri.c:316
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:383
+#: src/service/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:424
+#: src/service/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:441
+#: src/service/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
+#: src/service/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:535
+#: src/service/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/service/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/service/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:562
+#: src/service/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:568
+#: src/service/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/service/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/service/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/service/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:599
+#: src/service/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:613
+#: src/service/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:646
+#: src/service/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/fs_uri.c:666
+#: src/service/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1094
+#: src/service/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:234
-#, fuzzy, c-format
-msgid "Failed to load state: %s\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
-#, fuzzy, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:480
-#, fuzzy, c-format
-msgid "Publishing `%s'\n"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
-
-#: src/fs/gnunet-auto-share.c:491
-#, fuzzy, c-format
-msgid "Failed to run `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/fs/gnunet-auto-share.c:661
-#, fuzzy, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
-
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
-msgstr "ange prioritet för innehållet"
-
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-daemon-fsprofiler.c:668
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:106
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Katalog \"%s\":\n"
-
-#: src/fs/gnunet-directory.c:109
-#, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Katalog \"%s\":\n"
-
-#: src/fs/gnunet-directory.c:146
-#, fuzzy
-msgid "You must specify a filename to inspect.\n"
-msgstr "Du måste ange en lista av filer att lägga in.\n"
-
-#: src/fs/gnunet-directory.c:160
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/gnunet-directory.c:170
-#, fuzzy, c-format
-msgid "`%s' is not a GNUnet directory\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-
-#: src/fs/gnunet-directory.c:201
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-
-#: src/fs/gnunet-download.c:131
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/fs/gnunet-download.c:143
-#, fuzzy
-msgid "<unknown time>"
-msgstr "Okänt fel"
-
-#: src/fs/gnunet-download.c:155
-#, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:177
-#, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Fel vid nedladdning: %s\n"
-
-#: src/fs/gnunet-download.c:189
-#, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Uppladdning vägrades!"
-
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:234
-#, fuzzy
-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:240 src/fs/gnunet-publish.c:716
-#, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Fil \"%s\" har URI: %s\n"
-
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr ""
-
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
-msgstr "skriv filen till FILNAMN"
-
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr ""
-
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr ""
-
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
-msgstr "hämta en GNUnet-katalog rekursivt"
-
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/service/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:218
+#: src/service/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:225
+#: src/service/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:237
+#: src/service/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Visa alla alternativ"
-
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:247
-#, fuzzy, c-format
-msgid "Error publishing: %s.\n"
-msgstr "Fel vid nedladdning: %s\n"
-
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:259
-#, fuzzy, c-format
-msgid "URI is `%s'.\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/fs/gnunet-publish.c:280
-#, fuzzy
-msgid "Starting cleanup after abort\n"
-msgstr "\"%s\" uppstart klar.\n"
-
-#: src/fs/gnunet-publish.c:287
-#, fuzzy
-msgid "Cleanup after abort completed.\n"
-msgstr "\"%s\" uppstart klar.\n"
-
-#: src/fs/gnunet-publish.c:292
-#, fuzzy
-msgid "Cleanup after abort failed.\n"
-msgstr "\"%s\" uppstart klar.\n"
-
-#: src/fs/gnunet-publish.c:426
-#, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "Uppdaterar data för modul \"%s\"\n"
-
-#: src/fs/gnunet-publish.c:428
-#, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "Nyckelord för fil \"%s\":\n"
-
-#: src/fs/gnunet-publish.c:583
-#, fuzzy
-msgid "Could not publish\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/fs/gnunet-publish.c:612
-#, fuzzy
-msgid "Could not start publishing.\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
-msgid "Scanning directory `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/gnunet-publish.c:647
-#, fuzzy, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/fs/gnunet-publish.c:653
-#, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:659
-#, fuzzy
-msgid "Preprocessing complete.\n"
-msgstr "Nedstängning klar.\n"
-
-#: src/fs/gnunet-publish.c:665
-#, 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:671
-msgid "Meta data extraction has finished.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "=\tFel vid läsning av katalog.\n"
-
-#: src/fs/gnunet-publish.c:706
-#, fuzzy, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
-
-#: src/fs/gnunet-publish.c:738
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:811
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:818
-#, 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:824
-#, 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:833 src/vpn/gnunet-vpn.c:208
-#, 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:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:907
-msgid "enable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:921
-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:928
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:953
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:965
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:972
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:980
-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:998
-msgid "Publish a file or directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-search.c:446
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:535
-#, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Fel vid lämning av DHT.\n"
-
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:602
-#, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:608
-#, c-format
-msgid "An output file is mandatory for silent mode.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:629
-#, fuzzy
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:662
-#, fuzzy, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/fs/gnunet-search.c:676
-#, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/fs/gnunet-search.c:702
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
-msgstr ""
-
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:733
-msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
-msgstr ""
-
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
-msgstr ""
-
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
-msgstr ""
-
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
-msgstr ""
-
-#: src/fs/gnunet-search.c:776
-#, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-msgid "Search for files that have been published on GNUnet\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs.c:423
+#: src/service/fs/gnunet-service-fs.c:423
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:785
+#: src/service/fs/gnunet-service-fs.c:785
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs.c:825
+#: src/service/fs/gnunet-service-fs.c:825
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/service/fs/gnunet-service-fs.c:995
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1237
+#: src/service/fs/gnunet-service-fs.c:1237
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:539
+#: src/service/fs/gnunet-service-fs_cp.c:539
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:671
+#: src/service/fs/gnunet-service-fs_cp.c:671
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:868
+#: src/service/fs/gnunet-service-fs_cp.c:868
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/service/fs/gnunet-service-fs_cp.c:893
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:903
+#: src/service/fs/gnunet-service-fs_cp.c:903
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1000
+#: src/service/fs/gnunet-service-fs_cp.c:1000
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1058
+#: src/service/fs/gnunet-service-fs_cp.c:1058
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1082
+#: src/service/fs/gnunet-service-fs_cp.c:1082
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1096
+#: src/service/fs/gnunet-service-fs_cp.c:1096
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/service/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1197
+#: src/service/fs/gnunet-service-fs_cp.c:1197
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1541
+#: src/service/fs/gnunet-service-fs_cp.c:1541
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/service/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/service/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:296
+#: src/service/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/service/fs/gnunet-service-fs_indexing.c:314
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/service/fs/gnunet-service-fs_indexing.c:328
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:260
+#: src/service/fs/gnunet-service-fs_pe.c:260
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:422
+#: src/service/fs/gnunet-service-fs_pe.c:422
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/service/fs/gnunet-service-fs_pe.c:433
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:462
+#: src/service/fs/gnunet-service-fs_pe.c:462
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_pe.c:530
+#: src/service/fs/gnunet-service-fs_pe.c:530
 #, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:540
+#: src/service/fs/gnunet-service-fs_pe.c:540
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:305
+#: src/service/fs/gnunet-service-fs_pr.c:305
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:795
+#: src/service/fs/gnunet-service-fs_pr.c:795
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:869
+#: src/service/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/service/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1032
+#: src/service/fs/gnunet-service-fs_pr.c:1032
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1073
+#: src/service/fs/gnunet-service-fs_pr.c:1073
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/service/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/service/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1433
+#: src/service/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1488
+#: src/service/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1503
+#: src/service/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1526
+#: src/service/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/service/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/service/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1570
+#: src/service/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1616
+#: src/service/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629
+#: src/service/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/service/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1744
+#: src/service/fs/gnunet-service-fs_pr.c:1744
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_push.c:643
+#: src/service/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:103
-#, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
-msgstr ""
-"\n"
-"Fel vid avindexering av fil: %s\n"
-
-#: src/fs/gnunet-unindex.c:109
-#, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Avindexera filer."
-
-#: src/fs/gnunet-unindex.c:142
-#, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
-
-#: src/fs/gnunet-unindex.c:162
-#, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
-msgstr ""
-
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
 msgid "metadata length"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
+#: src/service/fs/meta_data.c:1073
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr ""
 
-#: src/fs/meta_data.c:1092
+#: src/service/fs/meta_data.c:1092
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/meta_data.c:1124
+#: src/service/fs/meta_data.c:1124
 #, c-format
 msgid "Serialized %ld bytes of metadata"
 msgstr ""
 
-#: src/fs/meta_data.c:1131
+#: src/service/fs/meta_data.c:1131
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Okänt fel"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Okänt fel"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# sessionsnycklar accepterade"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
-msgid "No label given."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "# byte mottogs via TCP"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
-#: src/gns/gns_tld_api.c:292
+#: src/service/gns/gns_tld_api.c:292
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
+#: src/service/gns/gnunet-bcd.c:573
 #, fuzzy, c-format
 msgid "Invalid port number %u\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
 msgid "Unable to set up the daemon\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:660
+#: src/service/gns/gnunet-bcd.c:660
 msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
+#: src/service/gns/gnunet-bcd.c:669
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
+#: src/service/gns/gnunet-dns2gns.c:296
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:377
+#: src/service/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/service/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/service/gns/gnunet-dns2gns.c:654
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/service/gns/gnunet-dns2gns.c:670
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/service/gns/gnunet-dns2gns.c:678
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:839
+#: src/service/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:999
+#: src/service/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1016
+#: src/service/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
+#: src/service/gns/gnunet-gns-benchmark.c:582
 msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
+#: src/service/gns/gnunet-gns-benchmark.c:588
 msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
+#: src/service/gns/gnunet-gns-benchmark.c:593
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
+#: src/service/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:979
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/service/gns/gnunet-gns-proxy.c:2654
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/service/gns/gnunet-gns-proxy.c:2686
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/service/gns/gnunet-gns-proxy.c:2895
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/service/gns/gnunet-gns-proxy.c:3268
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/service/gns/gnunet-gns-proxy.c:3300
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3868
+#: src/service/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3873
+#: src/service/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3877
+#: src/service/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
+#: src/service/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "\"%s\" är inte tillgänglig."
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Spåra GNUnets nätverkstopologi."
-
-#: src/gns/gnunet-service-gns.c:518
+#: src/service/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:900
+#: src/service/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:213
-#, fuzzy, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:230
-#, fuzzy, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:254
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gns/plugin_rest_gns.c:450
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, fuzzy, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, fuzzy, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, fuzzy, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
-#, fuzzy, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
-#, fuzzy, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
-#, fuzzy, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/hello/gnunet-hello.c:303
-#, fuzzy, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/hello/gnunet-hello.c:310
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:315
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
-#, fuzzy, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/hello/gnunet-hello.c:339
-#, fuzzy, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
-msgstr "%d filer hittades i katalog.\n"
-
-#: src/hello/gnunet-hello.c:386
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/hello/gnunet-hello.c:395
-#, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:409
-msgid "Hello file to read"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:418
-#, fuzzy
-msgid "Print information about peers."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/hello/hello.c:1089
-#, fuzzy
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/hello/hello.c:1099
-#, fuzzy
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/hello/hello.c:1109
-#, fuzzy
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/hello/hello.c:1121
-#, fuzzy
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/hello/hello.c:1139
-#, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr ""
-
-#: src/hello/hello.c:1147
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr ""
-
-#: src/hello/hello.c:1162
-#, fuzzy, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist.c:306
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
-#, fuzzy, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-msgid "Expired HELLO encountered (ignored)"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, fuzzy, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
 #, fuzzy
 msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:225
-#, fuzzy, c-format
-msgid "Failed to create ego: %s\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
-msgstr ""
-
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:576
-msgid "reduce output"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:597
-msgid "display private keys as well"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
-msgstr ""
-
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/identity/gnunet-service-identity.c:921
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/identity/gnunet-service-identity.c:979
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/identity/gnunet-service-identity.c:988
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/plugin_rest_identity.c:1245
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namecache/gnunet-namecache.c:105
-#, fuzzy, c-format
-msgid "No records found for `%s'"
-msgstr "%d filer hittades i katalog.\n"
-
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:174
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "anger vilken TRANSPORT som ska testas"
-
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/namecache/gnunet-namecache.c:187
-#, fuzzy, c-format
-msgid "You must specify a name\n"
-msgstr "Du måste ange en mottagare!\n"
-
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:220
-#, fuzzy
-msgid "specifies the public key of the zone to look in"
-msgstr "ange prioritet för innehållet"
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet-konfiguration"
-
-#: src/namecache/namecache_api.c:283
+#: src/service/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:371
+#: src/service/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/namecache/plugin_namecache_flat.c:404
-msgid "flat plugin running\n"
-msgstr ""
-
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
-#, fuzzy, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr "Onödiga argument (ignorerade).\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "GNUnet-konfiguration"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
 #, fuzzy
 msgid "no errors"
 msgstr "Okänt fel"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
 #, fuzzy
 msgid "unable to store record"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
 #, fuzzy
 msgid "invalid name"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
 #, fuzzy
 msgid "No expiration specified for records.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Fil \"%s\" har URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Fil \"%s\" har URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-#, fuzzy
-msgid "name of the ego controlling the zone"
-msgstr "Visa värde av alternativet"
-
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/namestore/gnunet-namestore.c:668
-#, fuzzy, c-format
-msgid "Adding record failed: %s\n"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
-
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/namestore/gnunet-namestore.c:1381
-#, fuzzy
-msgid "name"
-msgstr "Visa namn"
-
-#: src/namestore/gnunet-namestore.c:1410
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1461
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/namestore/gnunet-namestore.c:1471
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1491
-#, fuzzy, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
-
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, fuzzy, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1642
-#, fuzzy, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1679
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/namestore/gnunet-namestore.c:1967
-#, fuzzy, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2010
-#, fuzzy
-msgid "set the desired nick name for the zone"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/namestore/gnunet-namestore.c:2015
-#, fuzzy
-msgid "monitor changes in the namestore"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore.c:2025
-#, fuzzy
-msgid "Output in recordline format"
-msgstr "utdata i gnuplot-format"
-
-#: src/namestore/gnunet-namestore.c:2031
-#, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2056
-msgid "omit private records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:792
-msgid "Flat file database running\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:956
-msgid "SQlite database running\n"
-msgstr ""
-
-#: src/namestore/plugin_rest_namestore.c:1320
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:189
-#, fuzzy
-msgid "Suggested configuration changes:\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, fuzzy, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:327
-#, fuzzy
-msgid "run autoconfiguration"
-msgstr "GNUnet-konfiguration"
-
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-#, fuzzy
-msgid "write configuration file (for autoconfiguration)"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:355
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr "GNUnet-konfiguration"
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
 #, fuzzy
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
+#: src/service/nat-auto/nat_auto_api.c:73
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/service/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
+#: src/service/nat-auto/nat_auto_api.c:79
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/service/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
+#: src/service/nat-auto/nat_auto_api.c:85
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/service/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat-auto/nat_auto_api.c:91
+#: src/service/nat-auto/nat_auto_api.c:91
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/service/nat-auto/nat_auto_api.c:94
 #, fuzzy
 msgid "`upnpc' command took too long, process killed"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat-auto/nat_auto_api.c:97
+#: src/service/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/service/nat-auto/nat_auto_api.c:100
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat-auto/nat_auto_api.c:103
+#: src/service/nat-auto/nat_auto_api.c:103
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/service/nat-auto/nat_auto_api.c:106
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:109
+#: src/service/nat-auto/nat_auto_api.c:109
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
+#: src/service/nat-auto/nat_auto_api.c:113
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/nat-auto/nat_auto_api.c:116
+#: src/service/nat-auto/nat_auto_api.c:116
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:119
+#: src/service/nat-auto/nat_auto_api.c:119
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
+#: src/service/nat-auto/nat_auto_api.c:122
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
+#: src/service/nat-auto/nat_auto_api.c:125
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
+#: src/service/nat-auto/nat_auto_api.c:128
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/nat-auto/nat_auto_api_test.c:489
+#: src/service/nat-auto/nat_auto_api_test.c:489
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:464
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr ""
-
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/nat/gnunet-service-nat.c:1362
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1861
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Samling stoppad.\n"
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1935
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/gnunet-service-nat_mini.c:188
+#: src/service/nat/gnunet-service-nat_mini.c:188
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:602
+#: src/service/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/service/nse/gnunet-nse-profiler.c:857
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-nse-profiler.c:864
+#: src/service/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:879
+#: src/service/nse/gnunet-nse-profiler.c:879
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:888
+#: src/service/nse/gnunet-nse-profiler.c:888
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/service/nse/gnunet-nse-profiler.c:900
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:912
+#: src/service/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-nse.c:124
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# byte mottogs via TCP"
-
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/service/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:657
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:688
+#: src/service/peerstore/gnunet-service-peerstore.c:692
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/peerstore/peerstore_api.c:781
+#: src/service/peerstore/peerstore_api.c:781
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/peerstore_api.c:895
+#: src/service/peerstore/peerstore_api.c:895
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/pt/gnunet-daemon-pt.c:416
+#: src/service/pt/gnunet-daemon-pt.c:416
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:422
+#: src/service/pt/gnunet-daemon-pt.c:422
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:476
+#: src/service/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:671
+#: src/service/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:678
+#: src/service/pt/gnunet-daemon-pt.c:678
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/service/pt/gnunet-daemon-pt.c:716
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:771
+#: src/service/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:777
+#: src/service/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:786
+#: src/service/pt/gnunet-daemon-pt.c:786
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/service/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:898
+#: src/service/pt/gnunet-daemon-pt.c:898
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/pt/gnunet-daemon-pt.c:1314
+#: src/service/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:805
-#, fuzzy, c-format
-msgid "Ego is required\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/reclaim/gnunet-reclaim.c:812
-#, c-format
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:819
-#, fuzzy, c-format
-msgid "Requesting party key is required!\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:852
-#, fuzzy
-msgid "The EGO to use"
-msgstr "meddelandestorlek"
-
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
-msgstr ""
-
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-#, fuzzy
-msgid "OpenID Connect REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/reclaim/reclaim_api.c:544
+#: src/service/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1365
+#: src/service/regex/gnunet-regex-profiler.c:1365
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1421
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/service/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1450
+#: src/service/regex/gnunet-regex-profiler.c:1450
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1539
+#: src/service/regex/gnunet-regex-profiler.c:1539
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1546
+#: src/service/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1552
+#: src/service/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
+#: src/service/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1566
+#: src/service/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1581
+#: src/service/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
 #, fuzzy
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:151
+#: src/service/regex/regex_api_announce.c:151
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/regex/regex_api_search.c:200
+#: src/service/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest/gnunet-rest-server.c:1369
+#: src/service/rest/gnunet-rest-server.c:1369
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/rest/plugin_rest_config.c:428
-#, fuzzy
-msgid "CONFIG REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/rest/plugin_rest_copying.c:211
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/revocation/gnunet-revocation.c:146
-#, fuzzy, c-format
-msgid "Key `%s' is valid\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
-
-#: src/revocation/gnunet-revocation.c:150
-#, fuzzy, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr "Tjänst borttagen.\n"
-
-#: src/revocation/gnunet-revocation.c:154
-#, fuzzy
-msgid "Internal error\n"
-msgstr "Okänt fel.\n"
-
-#: src/revocation/gnunet-revocation.c:180
-#, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:183
-#, fuzzy
-msgid "Revocation failed (!)\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:334
-#, fuzzy, c-format
-msgid "Ego `%s' not found.\n"
-msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
-
-#: src/revocation/gnunet-revocation.c:350
-#, fuzzy, c-format
-msgid "Error: Key is invalid\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
-
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:424
-#, fuzzy, c-format
-msgid "Public key `%s' malformed\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:464
-#, fuzzy
-msgid "No filename to store revocation certificate given.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/revocation/gnunet-revocation.c:481
-#, fuzzy, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/revocation/gnunet-revocation.c:511
-#, fuzzy
-msgid "No action specified. Nothing to do.\n"
-msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
-
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:558
-#, fuzzy
-msgid "number of epochs to calculate for"
-msgstr "antal iterationer"
-
-#: src/revocation/gnunet-service-revocation.c:539
+#: src/service/revocation/gnunet-service-revocation.c:539
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# byte mottogs via TCP"
 
-#: src/revocation/gnunet-service-revocation.c:549
+#: src/service/revocation/gnunet-service-revocation.c:549
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
+#: src/service/revocation/gnunet-service-revocation.c:558
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/revocation/gnunet-service-revocation.c:566
+#: src/service/revocation/gnunet-service-revocation.c:566
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:604
+#: src/service/revocation/gnunet-service-revocation.c:604
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
+#: src/service/revocation/gnunet-service-revocation.c:959
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3148
-#, fuzzy
-msgid "timeout for the profiling"
-msgstr "ange prioritet för innehållet"
-
-#: src/rps/gnunet-rps-profiler.c:3153
-#, fuzzy
-msgid "number of PeerIDs to request"
-msgstr "antal iterationer"
-
-#: src/rps/gnunet-rps-profiler.c:3170
-#, fuzzy
-msgid "Measure quality and performance of the RPS service."
-msgstr "Kan inte tillgå tjänsten"
-
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-#, fuzzy
-msgid "You must specify at least one message ID to check!\n"
-msgstr "Du måste ange en lista av filer att lägga in.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, fuzzy, c-format
-msgid "Malformed input, could not parse `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-#, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr " Anslutning misslyckades (fel?)\n"
-
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-#, fuzzy
-msgid "number of peers in consensus"
-msgstr "antal iterationer"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "antal iterationer"
-
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "antal iterationer"
-
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-#, fuzzy
-msgid "number of values"
-msgstr "antal iterationer"
-
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-msgid "write statistics to file"
-msgstr ""
-
-#: src/seti/gnunet-seti-profiler.c:457
+#: src/service/seti/gnunet-seti-profiler.c:457
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
-msgstr ""
-
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
-msgstr ""
-
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, fuzzy, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:577
-#, c-format
-msgid "No subsystem or name given\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:589
-#, fuzzy, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/statistics/gnunet-statistics.c:725
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/statistics/gnunet-statistics.c:742
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/statistics/gnunet-statistics.c:751
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:783
-#, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
-msgstr "Skriv ut statistik om GNUnet-operationer."
-
-#: src/statistics/statistics_api.c:749
+#: src/service/statistics/statistics_api.c:749
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/testing/gnunet-testing.c:185
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:386
+#: src/service/testing/gnunet-testing.c:386
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:392
+#: src/service/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:400
+#: src/service/testing/gnunet-testing.c:400
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:407
+#: src/service/testing/gnunet-testing.c:407
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:415
+#: src/service/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
+#: src/service/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr ""
-
-#: src/testing/list-keys.c:92
+#: src/service/testing/list-keys.c:92
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/testing.c:291
+#: src/service/testing/testing.c:291
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:743
+#: src/service/testing/testing.c:743
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:1217
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1226
+#: src/service/testing/testing.c:1226
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:1236
+#: src/service/testing/testing.c:1236
 #, fuzzy
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/testing/testing.c:1249
+#: src/service/testing/testing.c:1249
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:1265
+#: src/service/testing/testing.c:1265
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1279
+#: src/service/testing/testing.c:1279
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1307
+#: src/service/testing/testing.c:1307
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing.c:1413
+#: src/service/testing/testing.c:1413
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1664
+#: src/service/testing/testing.c:1664
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing.c:2795
+#: src/service/testing/testing.c:2795
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testing/testing.c:2803
+#: src/service/testing/testing.c:2803
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testing/testing.c:2811
+#: src/service/testing/testing.c:2811
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:257
+#: src/service/topology/gnunet-daemon-topology.c:257
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:451
+#: src/service/topology/gnunet-daemon-topology.c:451
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:805
+#: src/service/topology/gnunet-daemon-topology.c:805
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:870
+#: src/service/topology/gnunet-daemon-topology.c:870
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/service/topology/gnunet-daemon-topology.c:1005
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-communicator-quic.c:1787
+#: src/service/transport/gnunet-communicator-quic.c:1787
 msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
+#: src/service/transport/gnunet-communicator-tcp.c:4071
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
+#: src/service/transport/gnunet-communicator-udp.c:3433
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
+#: src/service/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1015
+#: src/service/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-communicator-unix.c:1138
+#: src/service/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/transport/gnunet-transport.c:406
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/transport/gnunet-transport.c:415
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/transport/gnunet-transport.c:454
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:477
+#: src/service/transport/gnunet-transport.c:477
 #, fuzzy
 msgid "Failed to list connections, timeout occurred\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/transport/gnunet-transport.c:504
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:537
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/transport/gnunet-transport.c:566
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:592
+#: src/service/transport/gnunet-transport.c:592
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/service/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/transport/gnunet-transport.c:654
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/transport/gnunet-transport.c:701
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1103
+#: src/service/transport/gnunet-transport.c:1103
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/transport/gnunet-transport.c:1199
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/transport/gnunet-transport.c:1214
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1242
+#: src/service/transport/gnunet-transport.c:1242
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1248
+#: src/service/transport/gnunet-transport.c:1248
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1301
+#: src/service/transport/gnunet-transport.c:1301
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1367
+#: src/service/transport/gnunet-transport.c:1367
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1373
+#: src/service/transport/gnunet-transport.c:1373
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/service/transport/gnunet-transport.c:1377
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1383
+#: src/service/transport/gnunet-transport.c:1383
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/transport/gnunet-transport.c:1395
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1399
+#: src/service/transport/gnunet-transport.c:1399
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1404
+#: src/service/transport/gnunet-transport.c:1404
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1408
+#: src/service/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
+#: src/service/transport/gnunet-transport.c:1414
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
+#: src/service/transport/gnunet-transport.c:1426
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/transport/transport_api2_communication.c:761
+#: src/service/transport/transport_api2_communication.c:761
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Fel vid skapandet av användare"
-
-#: src/util/bio.c:241
-#, fuzzy
-msgid "End of file"
-msgstr "Läs in en konfigurationsfil"
-
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Fel vid nedladdning: %s\n"
-
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
-
-#: src/util/bio.c:312
-#, fuzzy, c-format
-msgid "Invalid handle type while reading `%s'"
-msgstr "Ogiltiga kommandoradsargument:\n"
-
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
-msgstr ""
-
-#: src/util/bio.c:345
-#, fuzzy, c-format
-msgid "%s (while reading `%s')"
-msgstr "Fel vid nedladdning: %s\n"
-
-#: src/util/bio.c:350
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr ""
-
-#: src/util/bio.c:363
-#, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
-msgstr ""
-
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Fel vid nedladdning: %s\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
-
-#: src/util/bio.c:773
-#, fuzzy, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
-msgstr ""
-
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:910
-#, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr ""
-
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "FEL"
-
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "VARNING"
-
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
-msgstr "MEDDELANDE"
-
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "FELSÖKNING"
-
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr ""
-
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr ""
-
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr ""
-
-#: src/util/common_logging.c:1416
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/util/common_logging.c:1431
-#, fuzzy, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
-
-#: src/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/configuration.c:1718
-#, fuzzy
-msgid "Not a valid relative time specification"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:148
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:263
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:554
-#, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/util/crypto_ecc.c:677
-#, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/util/crypto_ecc_setup.c:282
-#, fuzzy
-msgid "Could not load peer's private key\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
-
-#: src/util/crypto_rsa.c:908
-#, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/util/crypto_rsa.c:1208
-#, fuzzy, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/util/disk.c:843
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
-
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
-
-#: src/util/dnsparser.c:910
-#, fuzzy, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/dnsstub.c:228
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/util/dnsstub.c:371
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
-msgstr ""
-
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/util/dnsstub.c:509
-#, fuzzy, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
-
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
-
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagga \"%s\" kräver ett argument\n"
-
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
-
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
-
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
-
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ogiltig flagga -- %c\n"
-
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flagga kräver ett argument -- %c\n"
-
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagga \"-W %s\" är tvetydig\n"
-
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
-
-#: src/util/getopt.c:971
-#, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "Använd --help för att få en lista på flaggor.\n"
-
-#: src/util/getopt.c:984
-#, fuzzy, c-format
-msgid "Option `%s' can't be used with other options.\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
-
-#: src/util/getopt.c:996
-#, fuzzy, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
-msgstr "skriv ut versionsnummer"
-
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
-"korta flaggor.\n"
-
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
-msgstr "skriv ut denna hjälp"
-
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
-msgstr "var informativ"
-
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
-
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:463
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/getopt_helpers.c:571
-#, fuzzy, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
-msgstr ""
-
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
-msgstr ""
-
-#: src/util/getopt_helpers.c:632
-#, fuzzy, c-format
-msgid "You must pass relative time to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/getopt_helpers.c:686
-#, fuzzy, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/getopt_helpers.c:743
-#, fuzzy, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:806
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:876
-#, fuzzy, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
-
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
-msgstr ""
-
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
-msgstr ""
-
-#: src/util/gnunet-config.c:192
-#, fuzzy
-msgid "Manipulate GNUnet configuration files"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:95
-#, fuzzy, c-format
-msgid "Failed to open `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/gnunet-ecc.c:129
-#, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:178
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/util/gnunet-ecc.c:185
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Finished!\n"
-msgstr "Slutför"
-
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:304
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' not found\n"
-msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
-
-#: src/util/gnunet-ecc.c:314
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' is empty\n"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/util/gnunet-ecc.c:334
-#, fuzzy, c-format
-msgid "Could not read hostkey file: %s\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:479
-msgid "print the public key in HEX format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:499
-#, fuzzy
-msgid "Manipulate GNUnet private ECC key files"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Fil \"%s\" har URI: %s\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "Ogiltiga argument: "
-
-#: src/util/gnunet-qr.c:161
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/gnunet-qr.c:171
-#, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:182
-#, c-format
-msgid "No known handler for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
-#, c-format
-msgid "Got %d images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
-#, fuzzy, c-format
-msgid "Found %s: \"%s\"\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
-
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-
-#: src/util/gnunet-qr.c:546
-#, fuzzy
-msgid "No data found\n"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
-msgstr ""
-
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
-msgstr ""
-
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:183
-msgid "Use built-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:215
-#, fuzzy, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
-
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:313
-#, fuzzy
-msgid "Manipulate GNUnet proof of work files"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/util/gnunet-service-resolver.c:1288
+#: src/service/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:95
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:109
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
-msgstr ""
-
-#: src/util/helper.c:304
-#, fuzzy, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/util/helper.c:356
-#, fuzzy, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/util/helper.c:571
-#, fuzzy, c-format
-msgid "Error writing to `%s': %s\n"
-msgstr "Fel vid skapandet av användare"
-
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
-msgstr ""
-
-#: src/util/network.c:1284
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
-
-#: src/util/os_installation.c:416
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr ""
-
-#: src/util/os_installation.c:787
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
-
-#: src/util/os_installation.c:820
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-
-#: src/util/plugin.c:158
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
-
-#: src/util/plugin.c:215
-#, fuzzy, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/util/plugin.c:371
-#, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
-
-#: src/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/regex.c:123
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:243
-#, fuzzy, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
-msgstr ""
-"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion "
-"\"%s\".\n"
-
-#: src/util/resolver_api.c:888
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:1086
-msgid "Resolver not configured correctly.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/service.c:654
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
-msgstr ""
-
-#: src/util/service.c:838
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "Okänd operation \"%s\"\n"
-
-#: src/util/service.c:951
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:992
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-# drive = hard drive ?
-#: src/util/service.c:1401
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-#: src/util/service.c:1413
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
-
-#: src/util/service.c:1420
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
-
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr ""
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
-
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/service.c:2099
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
-msgstr ""
-
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
-msgstr ""
-
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
-msgstr ""
-
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
-msgstr ""
-
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr ""
-
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr ""
-
-#: src/util/strings.c:1081
-#, fuzzy, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
-msgstr ""
-
-#: src/util/strings.c:1283
-#, fuzzy, c-format
-msgid "Malformed port policy `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/util/strings.c:1408
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
-
-#: src/util/strings.c:1459
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/util/strings.c:1501
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/strings.c:1551
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Fel format \"%s\" för nätmask: %s\n"
-
-#: src/util/strings.c:1582
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Fel format \"%s\" för nätverk: %s\n"
-
-#: src/util/time.c:901 src/util/time.c:929
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/util/time.c:937
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 #, fuzzy
 msgid "# Active channels"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:142
-#, fuzzy
-msgid "Error creating tunnel\n"
-msgstr "Klar med skapandet av värdnyckel.\n"
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
-
-#: src/vpn/gnunet-vpn.c:202
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/vpn/gnunet-vpn.c:216
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
-
-#: src/vpn/gnunet-vpn.c:239
-#, fuzzy, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "\"%s\" är inte en vanlig fil.\n"
-
-#: src/vpn/gnunet-vpn.c:258
-#, fuzzy, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "\"%s\" är inte tillgänglig."
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:334
-#, fuzzy
-msgid "service is offered via TCP"
-msgstr "# byte mottogs via TCP"
-
-#: src/vpn/gnunet-vpn.c:339
-#, fuzzy
-msgid "service is offered via UDP"
-msgstr "# byte mottagna via UDP"
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr ""
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
diff --git a/po/vi.po b/po/vi.po
index 1afa90272..4406e42a8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,590 +19,2522 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, fuzzy, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/abd/gnunet-abd.c:566
-#, fuzzy
-msgid "Ego does not exist!\n"
-msgstr "đặt số trình nền cần khởi chạy"
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, fuzzy, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, c-format
-msgid "ego required\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, fuzzy, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-#, fuzzy
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-#, fuzzy
-msgid "The public key of the authority to verify the credential against"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/abd/gnunet-abd.c:1030
-#, fuzzy
-msgid "The ego/zone name to use"
-msgstr "kích cỡ tin nhắn"
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-#, fuzzy
-msgid "GNUnet abd resolver tool"
-msgstr "Bản ghi lỗi GNUnet"
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, 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:168
+#: src/cli/arm/gnunet-arm.c:168
 #, 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:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is starting"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 #, fuzzy
 msgid "is stopping"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 #, fuzzy
 msgid "is stopping already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 #, fuzzy
 msgid "is started already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 #, fuzzy
 msgid "is stopped already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 #, fuzzy
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 #, 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:603
+#: src/cli/arm/gnunet-arm.c:603
 #, fuzzy
 msgid "All services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/cli/cadet/gnunet-cadet.c:685
+#, c-format
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:746
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cli/cadet/gnunet-cadet.c:775
+#, fuzzy
+msgid "No action requested\n"
+msgstr "Thu thập bị dừng.\n"
+
+#: src/cli/cadet/gnunet-cadet.c:800
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:817
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/cadet/gnunet-cadet.c:827
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:99
+#, fuzzy
+msgid "key received"
+msgstr "# các khoá phiên chạy bị từ chối"
+
+#: src/cli/core/gnunet-core.c:103
+#, fuzzy
+msgid "connection established"
+msgstr "Thu thập bị dừng.\n"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#: src/cli/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "Lỗi không rõ"
+
+#: src/cli/core/gnunet-core.c:129
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:157
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cli/core/gnunet-core.c:163
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+#, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/core/gnunet-core.c:196
+#, fuzzy
+msgid "Print information about connected peers."
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:257
+#, fuzzy, c-format
+msgid "Error queueing datastore GET operation\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/cli/datastore/gnunet-datastore.c:319
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/cli/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:378
+#, fuzzy, c-format
+msgid "Error queueing datastore PUT operation\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/cli/datastore/gnunet-datastore.c:454
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:477
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/cli/datastore/gnunet-datastore.c:482
+#, fuzzy
+msgid "Insert records into the datastore"
+msgstr "# các byte trong kho dữ liệu"
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:498
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/dht/gnunet-dht-get.c:167
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
+#, fuzzy, c-format
+msgid "Failed to connect to DHT service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/cli/dht/gnunet-dht-get.c:256
+msgid "Issuing DHT GET with key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+msgid "Failed to load state: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/cli/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:480
+#, fuzzy, c-format
+msgid "Publishing `%s'\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/cli/fs/gnunet-auto-share.c:491
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:661
+#, fuzzy, c-format
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+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/cli/fs/gnunet-auto-share.c:718
+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/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:761
+#, fuzzy
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr "Tự động chia sẻ một thư mục."
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
+#: src/cli/fs/gnunet-directory.c:54
+#, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:106
+#, fuzzy, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr "==> Thư mục « %s »:\n"
+
+#: src/cli/fs/gnunet-directory.c:109
+#, fuzzy, c-format
+msgid "Directory `%s' contents:\n"
+msgstr "==> Thư mục « %s »:\n"
+
+#: src/cli/fs/gnunet-directory.c:146
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/cli/fs/gnunet-directory.c:160
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/cli/fs/gnunet-directory.c:170
+#, fuzzy, c-format
+msgid "`%s' 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/cli/fs/gnunet-directory.c:201
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+
+#: src/cli/fs/gnunet-download.c:131
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/cli/fs/gnunet-download.c:143
+#, fuzzy
+msgid "<unknown time>"
+msgstr "Lỗi không rõ"
+
+#: src/cli/fs/gnunet-download.c:155
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:177
+#, fuzzy, c-format
+msgid "Error downloading: %s.\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/cli/fs/gnunet-download.c:189
+#, fuzzy, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
+
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
+#, fuzzy, c-format
+msgid "Unexpected status: %d\n"
+msgstr "Gặp sự kiện bất thường: %d\n"
+
+#: src/cli/fs/gnunet-download.c:234
+#, fuzzy
+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/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/cli/fs/gnunet-download.c:319
+#, fuzzy
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
+
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
+
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
+msgstr "ghi tập tin vào TÊN_TẬP_TIN"
+
+#: src/cli/fs/gnunet-download.c:343
+#, fuzzy
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
+
+#: src/cli/fs/gnunet-download.c:350
+#, fuzzy
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
+
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
+msgstr "tải xuống đệ quy một thư mục GNUnet"
+
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/cli/fs/gnunet-fs.c:180
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Tùy chọn chia sẻ tập tin"
+
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
+#: src/cli/fs/gnunet-publish.c:247
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
+msgid "Error publishing: %s.\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/cli/fs/gnunet-publish.c:255
+#, c-format
+msgid "Publishing `%s' done.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:259
+#, fuzzy, c-format
+msgid "URI is `%s'.\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/cli/fs/gnunet-publish.c:265
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/cli/fs/gnunet-publish.c:280
+#, fuzzy
+msgid "Starting cleanup after abort\n"
+msgstr "Hoàn thành khởi chạy « %s ».\n"
+
+#: src/cli/fs/gnunet-publish.c:287
+#, fuzzy
+msgid "Cleanup after abort completed.\n"
+msgstr "Hoàn thành khởi chạy « %s ».\n"
+
+#: src/cli/fs/gnunet-publish.c:292
+#, fuzzy
+msgid "Cleanup after abort failed.\n"
+msgstr "Hoàn thành khởi chạy « %s ».\n"
+
+#: src/cli/fs/gnunet-publish.c:426
+#, 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/cli/fs/gnunet-publish.c:428
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "Từ khoá cho tập tin « %s »:\n"
+
+#: src/cli/fs/gnunet-publish.c:583
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "Không thể truy cập đến « %s »: %s\n"
+
+#: src/cli/fs/gnunet-publish.c:612
+#, fuzzy
+msgid "Could not start publishing.\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/cli/fs/gnunet-publish.c:645
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/cli/fs/gnunet-publish.c:647
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/cli/fs/gnunet-publish.c:653
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:659
+msgid "Preprocessing complete.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:665
+#, 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/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:679
+#, fuzzy
+msgid "Error scanning directory.\n"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/cli/fs/gnunet-publish.c:706
+#, fuzzy, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
+
+#: src/cli/fs/gnunet-publish.c:738
+#, 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/arm/gnunet-service-arm.c:555 src/util/service.c:1226
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:811
+#, 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/cli/fs/gnunet-publish.c:818
+#, 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/cli/fs/gnunet-publish.c:824
+#, 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/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
+#, 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/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, 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/cli/fs/gnunet-publish.c:907
+#, fuzzy
+msgid "enable 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/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"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/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"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/cli/fs/gnunet-publish.c:928
+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/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"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/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"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/cli/fs/gnunet-publish.c:953
+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/cli/fs/gnunet-publish.c:965
+#, fuzzy
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+"chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
+
+#: src/cli/fs/gnunet-publish.c:972
+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/cli/fs/gnunet-publish.c:980
+msgid ""
+"URI to be published (can be used instead of passing a file to add keywords "
+"to the file with the respective URI)"
+msgstr ""
+"Đị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/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:446
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:535
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+msgid "Error searching: %s.\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:951
+#: src/cli/fs/gnunet-search.c:629
+#, fuzzy
+msgid "Could not create keyword URI from arguments.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:662
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/cli/fs/gnunet-search.c:676
+#, fuzzy
+msgid "Could not start searching.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/cli/fs/gnunet-search.c:702
+#, fuzzy
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
+
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:789
+#, fuzzy
+msgid "Search for files that have been published on GNUnet\n"
+msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
+
+#: src/cli/fs/gnunet-unindex.c:94
+#, fuzzy, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
+
+#: src/cli/fs/gnunet-unindex.c:103
+#, fuzzy, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+"\n"
+"Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
+
+#: src/cli/fs/gnunet-unindex.c:109
+#, fuzzy
+msgid "Unindexing done.\n"
+msgstr "Bỏ chỉ mục tập tin."
+
+#: src/cli/fs/gnunet-unindex.c:142
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/cli/fs/gnunet-unindex.c:162
+#, fuzzy
+msgid "Could not start unindex operation.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:345
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/cli/gns/gnunet-gns.c:351
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:374
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
+
+#: src/cli/identity/gnunet-identity.c:225
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:551
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:576
+msgid "reduce output"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:597
+#, fuzzy
+msgid "display private keys as well"
+msgstr "hiển thị giá trị tổng kiểm của tập tin"
+
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:105
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:174
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
+
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cli/namecache/gnunet-namecache.c:187
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "Phải ghi rõ tên hiệu\n"
+
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:220
+#, fuzzy
+msgid "specifies the public key of the zone to look in"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "Cấu hình GNUnet"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
+#, c-format
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "Cấu hình GNUnet"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:962
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
 #, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Đang b��t đầu tài v�� « %s »\n"
+msgid "Name `%s' is too long\n"
+msgstr "« %s » không ph��i là m��t tập tin.\n"
 
-#: src/arm/gnunet-service-arm.c:1062
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
 #, 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:"
+msgid "Failed to parse $TTL\n"
+msgstr "T��p tin « %s �� c�� URI: %s\n"
 
-#: src/arm/gnunet-service-arm.c:1093
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1124
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
 #, fuzzy, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr "Đang b��t đ���u tài lên « %s ».\n"
+msgid "Data `%s' invalid\n"
+msgstr "Định d��ng c���a biệt hiệu « %s » là không hợp lệ.\n"
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
 #, fuzzy, c-format
-msgid "Restarting service `%s'.\n"
-msgstr "Đang n��p và kh��i đ���ng dùng « %s ».\n"
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "Lỗi k��t n��i đ���n gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
+#: src/cli/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "Không rõ câu lệnh « %s ».\n"
+
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1765
+#: src/cli/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "Gặp lỗi khi lưu cấu hình."
+
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
+msgid ""
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1302
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1327
+#, c-format
+msgid "%s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1356
+#, fuzzy, c-format
+msgid "No options given\n"
+msgstr "chưa đưa ra tên"
+
+#: src/cli/namestore/gnunet-namestore.c:1370
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1381
 #, fuzzy
-msgid "unknown"
-msgstr "Lỗi không r��"
+msgid "name"
+msgstr "không-t��n"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
-msgid "Service `%s' took %s to terminate\n"
+msgid "Invalid nick `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1471
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2004
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2010
+#, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/namestore/gnunet-namestore.c:2015
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/cli/namestore/gnunet-namestore.c:2025
+#, fuzzy
+msgid "Output in recordline format"
+msgstr "kết xuất theo định dạng gnuplot"
+
+#: src/cli/namestore/gnunet-namestore.c:2031
+#, fuzzy
+msgid "determine our name for the given KEY"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2056
+msgid "omit private records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr ""
+"\n"
+"CHƯA lưu các thay đổi trong cấu hình.\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "Cấu hình hạn ngạch"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "Cấu hình GNUnet"
+
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:124
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:852
+#, fuzzy
+msgid "The EGO to use"
+msgstr "kích cỡ tin nhắn"
+
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, fuzzy, c-format
+msgid "Key `%s' is valid\n"
+msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:150
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/revocation/gnunet-revocation.c:154
+#, fuzzy
+msgid "Internal error\n"
+msgstr "Lỗi VR."
+
+#: src/cli/revocation/gnunet-revocation.c:180
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/revocation/gnunet-revocation.c:183
+#, fuzzy
+msgid "Revocation failed (!)\n"
+msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:189
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
+#: src/cli/revocation/gnunet-revocation.c:334
+#, fuzzy, c-format
+msgid "Ego `%s' not found.\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:350
+#, fuzzy, c-format
+msgid "Error: Key is invalid\n"
+msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:187
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:424
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cli/revocation/gnunet-revocation.c:434
 msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
+#: src/cli/revocation/gnunet-revocation.c:464
 #, fuzzy
-msgid "public auction outcome"
-msgstr "��ng d��ng b��� h��y b���."
+msgid "No filename to store revocation certificate given.\n"
+msgstr "L��i đ��c danh sách b���n bè t�� « %s ��\n"
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/revocation/gnunet-revocation.c:481
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
+
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
+#: src/cli/revocation/gnunet-revocation.c:558
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "số lần lặp lại"
+
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:577
+#, fuzzy, c-format
+msgid "No subsystem or name given\n"
+msgstr "chưa đưa ra tên"
+
+#: src/cli/statistics/gnunet-statistics.c:589
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/cli/statistics/gnunet-statistics.c:725
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/cli/statistics/gnunet-statistics.c:742
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/cli/statistics/gnunet-statistics.c:751
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:783
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
+msgstr "In ra thống kê về các thao tác GNUnet."
+
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:192
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:95
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/cli/util/gnunet-ecc.c:129
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:178
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/cli/util/gnunet-ecc.c:185
+#, c-format
+msgid ""
+"\n"
+"Finished!\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:304
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/cli/util/gnunet-ecc.c:314
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
+
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:334
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:479
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:499
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/util/gnunet-qr.c:161
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/cli/util/gnunet-qr.c:171
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "Invalid URI: fails to specify a subsystem\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/util/gnunet-qr.c:182
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:218
 #, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
+msgid "Unable to start child process `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/cadet/gnunet-cadet.c:775
+#: src/cli/util/gnunet-qr.c:261
 #, fuzzy
-msgid "No action requested\n"
-msgstr "Thu th��p b��� dừng.\n"
+msgid "Capturing...\n"
+msgstr "Đang b��t đ���u tài v�� �� %s »\n"
 
-#: src/cadet/gnunet-cadet.c:800
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
+#, fuzzy, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
+
+#: src/cli/util/gnunet-qr.c:546
+msgid "No data found\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:183
+msgid "Use built-in GNUnet stub resolver"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:215
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
 #, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "In ra thông tin v��� c��c đồng đ���ng GNUnet."
+msgid "Value is too large.\n"
+msgstr "Giá trị không nằm trong ph���m vi đư���c phép."
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:313
 #, fuzzy
-msgid "Provide information about a patricular peer"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "Manipulate GNUnet proof of work files"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cli/util/gnunet-uri.c:95
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:142
 #, fuzzy
-msgid "Provide information about all peers"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "Error creating tunnel\n"
+msgstr "Hoàn thành tạo khoá.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense with 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/cadet/gnunet-cadet.c:827
+#: src/cli/vpn/gnunet-vpn.c:202
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/cli/vpn/gnunet-vpn.c:216
+#, fuzzy, c-format
+msgid "Option `%s' or `%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/cli/vpn/gnunet-vpn.c:239
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:258
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:334
 #, fuzzy
-msgid "Provide information about all tunnels"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "service is offered via TCP"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/cli/vpn/gnunet-vpn.c:339
+#, fuzzy
+msgid "service is offered via UDP"
+msgstr "# các byte đã nhận qua UDP"
+
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:566
+#, fuzzy
+msgid "Ego does not exist!\n"
+msgstr "đặt số trình nền cần khởi chạy"
+
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:890
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:983
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1011
+#, fuzzy
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1025
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/contrib/service/abd/gnunet-abd.c:1030
+#, fuzzy
+msgid "The ego/zone name to use"
+msgstr "kích cỡ tin nhắn"
+
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
+#: src/contrib/service/abd/gnunet-abd.c:1098
+#, fuzzy
+msgid "GNUnet abd resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
+
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+#, fuzzy
+msgid "public auction outcome"
+msgstr "Ứng dụng bị hủy bỏ."
+
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
 msgid ""
 "\n"
@@ -610,1677 +2542,2925 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/contrib/service/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
+#: src/contrib/service/conversation/gnunet-conversation.c:287
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/contrib/service/conversation/gnunet-conversation.c:356
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
+#: src/contrib/service/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
+#: src/contrib/service/conversation/gnunet-conversation.c:398
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
+#: src/contrib/service/conversation/gnunet-conversation.c:548
 #, c-format
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:607
+#: src/contrib/service/conversation/gnunet-conversation.c:607
 #, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/contrib/service/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/contrib/service/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/contrib/service/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/contrib/service/conversation/gnunet-conversation.c:680
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/contrib/service/conversation/gnunet-conversation.c:696
 #, c-format
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/contrib/service/conversation/gnunet-conversation.c:705
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/contrib/service/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:728
+#: src/contrib/service/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/contrib/service/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
+#: src/contrib/service/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/contrib/service/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/contrib/service/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/contrib/service/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/contrib/service/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/contrib/service/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/contrib/service/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/contrib/service/conversation/gnunet-conversation.c:958
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/contrib/service/conversation/gnunet-conversation.c:961
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/contrib/service/conversation/gnunet-conversation.c:964
 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/conversation/gnunet-conversation.c:1124
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/conversation/gnunet-conversation.c:1134
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1166
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/conversation/gnunet-conversation.c:1193
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:504
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:509
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:703
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
 #, fuzzy
 msgid "ogg_stream_init() failed.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/conversation/microphone.c:118
+#: src/contrib/service/conversation/microphone.c:118
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, c-format
 msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/conversation/speaker.c:73
+#: src/contrib/service/conversation/speaker.c:73
 #, fuzzy
 msgid "Could not start playback audio helper.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/core/gnunet-core.c:91
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
 #, fuzzy
-msgid "fresh connection"
-msgstr "# c��a các ��ồng đ��ng đã k��t n���i"
+msgid "number of peers to start"
+msgstr "số l��n l��p l���i"
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
 #, fuzzy
-msgid "key received"
-msgstr "# các khoá phiên ch���y b��� t�� chối"
+msgid "timeout for the profiling"
+msgstr "xác định mức ưu tiên c��a n��i dung"
 
-#: src/core/gnunet-core.c:103
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
 #, fuzzy
-msgid "connection established"
-msgstr "Thu th��p b��� d���ng.\n"
+msgid "number of PeerIDs to request"
+msgstr "số l��n l���p l���i"
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "Không thể truy cập đến dịch vụ"
+
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/core/gnunet-core.c:111
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
-msgid "disconnected"
-msgstr "« %.*s » đư��c k���t nối t���i « %.*s ��.\n"
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Phải ghi rõ ch�� m���t tên t���p tin đ��� chèn.\n"
 
-#: src/core/gnunet-core.c:120
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:124
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
 #, fuzzy
-msgid "unknown state"
-msgstr "Lỗi không rõ"
+msgid "Connect to CADET failed\n"
+msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/core/gnunet-core.c:129
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
+#, fuzzy
+msgid "number of peers in consensus"
+msgstr "số lần lặp lại"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "số lần lặp lại"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "số lần lặp lại"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+#, fuzzy
+msgid "number of values"
+msgstr "số lần lặp lại"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
+msgid "No error (success)."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "Lỗi không rõ.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
+#, fuzzy
+msgid "Ego not found."
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "Lỗi không rõ.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
+#, fuzzy
+msgid "Zone iteration failed."
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
+#, fuzzy
+msgid "Zone not found."
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
+#, fuzzy
+msgid "Record not found."
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
+#, fuzzy
+msgid "Zone does not contain any records."
+msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
+#, fuzzy
+msgid "No records given."
+msgstr "chưa đưa ra tên"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
+msgid "Record data invalid."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
+#, fuzzy
+msgid "No label given."
+msgstr "chưa đưa ra tên"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
+#, fuzzy
+msgid "No results given."
+msgstr "chưa đưa ra tên"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
+msgid "Record already exists."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
+msgid "Label invalid or malformed."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/lib/hello/gnunet-hello.c:310
 #, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:315
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
 #, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Error opening file `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/lib/hello/gnunet-hello.c:339
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n"
+
+#: src/lib/hello/gnunet-hello.c:386
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/lib/hello/gnunet-hello.c:395
+#, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:409
+msgid "Hello file to read"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:418
+#, fuzzy
+msgid "Print information about peers."
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/lib/hello/hello.c:1089
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/lib/hello/hello.c:1099
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/lib/hello/hello.c:1109
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/lib/hello/hello.c:1121
+#, fuzzy
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/lib/hello/hello.c:1139
+#, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1147
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1162
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/lib/sq/sq.c:47
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr ""
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
+msgstr ""
+
+#: src/lib/util/bio.c:312
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:163
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
+
+#: src/lib/util/bio.c:345
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/lib/util/bio.c:350
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr ""
+
+#: src/lib/util/bio.c:363
+#, c-format
+msgid "String `%s' longer than allowed (%u > %lu)"
+msgstr ""
+
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
+msgstr ""
+
+#: src/lib/util/bio.c:773
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:910
+#, fuzzy, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
+
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "LỖI"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "CẢNH BÁO"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "TIN"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "GỠ LỖI"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1416
+#, 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/lib/util/common_logging.c:1431
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %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/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/configuration.c:1718
 #, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "Not a valid relative time specification"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+"Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
+"tập hợp các sự chọn được phép\n"
+
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:148
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:263
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, 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"
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
+#: src/lib/util/crypto_ecc.c:554
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/lib/util/crypto_ecc.c:677
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
+
+#: src/lib/util/crypto_ecc_setup.c:282
 #, fuzzy
-msgid "provide information about all current connections (continuously)"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "Could not load peer's private key\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
+
+#: src/lib/util/crypto_rsa.c:908
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/lib/util/crypto_rsa.c:1208
+#, 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"
+
+#: src/lib/util/disk.c:843
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "Mong đợi « %s » là một thư mục.\n"
+
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
+
+#: src/lib/util/dnsparser.c:910
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/lib/util/dnsstub.c:228
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+
+#: src/lib/util/dnsstub.c:371
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)\n"
+msgstr ""
+
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/core/gnunet-core.c:196
+#: src/lib/util/dnsstub.c:509
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/lib/util/getopt.c:566
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
+
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
+
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
+
+#: src/lib/util/getopt.c:648
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: không nhận ra tùy chọn « --%s »\n"
+
+#: src/lib/util/getopt.c:654
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
+
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: tùy chọn không được phép -- %c\n"
+
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: tùy chọn không hợp lệ -- %c\n"
+
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
+
+#: src/lib/util/getopt.c:762
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
+
+#: src/lib/util/getopt.c:782
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
+
+#: src/lib/util/getopt.c:971
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr ""
+"Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
+
+#: src/lib/util/getopt.c:984
+#, fuzzy, c-format
+msgid "Option `%s' can't be used with other options.\n"
+msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt.c:996
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
+msgstr "hiển thị số thứ tự phiên bản"
+
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
+"ngắn.\n"
+
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
+msgstr "hiển thị trợ giúp này"
+
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
+msgstr "xuất chi tiết"
+
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
+msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+
+#: src/lib/util/getopt_helpers.c:446
 #, fuzzy
-msgid "Print information about connected peers."
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "configure logging to write logs to FILENAME"
+msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
+
+#: src/lib/util/getopt_helpers.c:463
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt_helpers.c:571
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt_helpers.c:578
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:632
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt_helpers.c:686
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt_helpers.c:743
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt_helpers.c:750
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:876
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/lib/util/getopt_helpers.c:954
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/lib/util/helper.c:304
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/lib/util/helper.c:356
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/lib/util/helper.c:571
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/lib/util/network.c:163
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/lib/util/network.c:1284
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:416
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:787
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/lib/util/os_installation.c:820
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
+
+#: src/lib/util/plugin.c:158
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
+
+#: src/lib/util/plugin.c:215
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
+
+#: src/lib/util/plugin.c:371
+#, fuzzy
+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/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:243
+#, c-format
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:888
+#, fuzzy, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr "không quyết định các tên máy"
+
+#: src/lib/util/resolver_api.c:901
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
+
+#: src/lib/util/resolver_api.c:1086
+msgid "Resolver not configured correctly.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "Không thể giải quyết « %s » (%s): %s\n"
+
+#: src/lib/util/service.c:654
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:838
+#, fuzzy, c-format
+msgid "Unknown address family %d\n"
+msgstr "\tKhông rõ miền tên « %s »\n"
+
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+
+#: src/lib/util/service.c:1401
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+
+#: src/lib/util/service.c:1413
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
+
+#: src/lib/util/service.c:1420
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
+
+#: src/lib/util/service.c:1481
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/lib/util/service.c:1505
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr "Không có người dùng như vậy"
+
+#: src/lib/util/service.c:1658
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
+
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/lib/util/socks.c:636
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/socks.c:653
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
+
+#: src/lib/util/strings.c:394
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr ""
+"Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1081
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1283
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
+
+#: src/lib/util/strings.c:1459
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/lib/util/strings.c:1551
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
+
+#: src/lib/util/strings.c:1582
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "Mạng có định dạng sai « %s »: %s\n"
+
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/lib/util/time.c:937
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/core/gnunet-service-core.c:329
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+#, fuzzy
+msgid "flat plugin running\n"
+msgstr "kho dữ liệu sqlite"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "kho dữ liệu sqlite"
+
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "kho dữ liệu sqlite"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+#, fuzzy
+msgid "SQlite database running\n"
+msgstr "kho dữ liệu sqlite"
+
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+#, fuzzy
+msgid "OpenID Connect REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+#, fuzzy
+msgid "CONFIG REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/service/arm/gnunet-service-arm.c:391
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:951
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/service/arm/gnunet-service-arm.c:1062
+#, 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/service/arm/gnunet-service-arm.c:1093
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1124
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1272
+#, fuzzy, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr "Đang bắt đầu tài lên « %s ».\n"
+
+#: src/service/arm/gnunet-service-arm.c:1604
+#, fuzzy, c-format
+msgid "Restarting service `%s'.\n"
+msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1765
+#, fuzzy
+msgid "unknown"
+msgstr "Lỗi không rõ"
+
+#: src/service/arm/gnunet-service-arm.c:1771
+#, fuzzy, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "Dịch vụ đã bị xoá.\n"
+
+#: src/service/arm/gnunet-service-arm.c:1798
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1815
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
+
+#: src/service/core/gnunet-service-core.c:329
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core.c:355
+#: src/service/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/service/core/gnunet-service-core.c:419
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:505
+#: src/service/core/gnunet-service-core.c:505
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:824
+#: src/service/core/gnunet-service-core.c:824
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:926
+#: src/service/core/gnunet-service-core.c:926
 #, 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.c:954
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/core/gnunet-service-core_kx.c:511
+#: src/service/core/gnunet-service-core_kx.c:511
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:569
+#: src/service/core/gnunet-service-core_kx.c:569
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:666
+#: src/service/core/gnunet-service-core_kx.c:666
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:718
+#: src/service/core/gnunet-service-core_kx.c:718
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:774
+#: src/service/core/gnunet-service-core_kx.c:774
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:806
+#: src/service/core/gnunet-service-core_kx.c:806
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:865
+#: src/service/core/gnunet-service-core_kx.c:865
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/service/core/gnunet-service-core_kx.c:880
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/service/core/gnunet-service-core_kx.c:917
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/service/core/gnunet-service-core_kx.c:943
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:962
+#: src/service/core/gnunet-service-core_kx.c:962
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/service/core/gnunet-service-core_kx.c:1072
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1082
+#: src/service/core/gnunet-service-core_kx.c:1082
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1134
+#: src/service/core/gnunet-service-core_kx.c:1134
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/service/core/gnunet-service-core_kx.c:1159
 #, 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:1172
+#: src/service/core/gnunet-service-core_kx.c:1172
 #, 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:1229
+#: src/service/core/gnunet-service-core_kx.c:1229
 #, 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:1237
+#: src/service/core/gnunet-service-core_kx.c:1237
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1246
+#: src/service/core/gnunet-service-core_kx.c:1246
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/service/core/gnunet-service-core_kx.c:1288
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1331
+#: src/service/core/gnunet-service-core_kx.c:1331
 #, 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:1343
+#: src/service/core/gnunet-service-core_kx.c:1343
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1352
+#: src/service/core/gnunet-service-core_kx.c:1352
 #, fuzzy
 msgid "# rekey operations 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:1521
+#: src/service/core/gnunet-service-core_kx.c:1521
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/service/core/gnunet-service-core_kx.c:1537
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/service/core/gnunet-service-core_kx.c:1632
 #, 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:1679
+#: src/service/core/gnunet-service-core_kx.c:1679
 #, 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:1689
+#: src/service/core/gnunet-service-core_kx.c:1689
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/service/core/gnunet-service-core_sessions.c:285
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:400
+#: src/service/core/gnunet-service-core_sessions.c:400
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/service/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
 #, fuzzy
 msgid "# type maps received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_typemap.c:217
+#: src/service/core/gnunet-service-core_typemap.c:217
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:492
+#: src/service/datacache/plugin_datacache_heap.c:492
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, 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"
-
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:340
+#: src/service/datastore/datastore_api.c:340
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/datastore/datastore_api.c:462
+#: src/service/datastore/datastore_api.c:462
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/datastore/datastore_api.c:565
+#: src/service/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:595
+#: src/service/datastore/datastore_api.c:595
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:756
+#: src/service/datastore/datastore_api.c:756
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:810
+#: src/service/datastore/datastore_api.c:810
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:917
+#: src/service/datastore/datastore_api.c:917
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:1007
+#: src/service/datastore/datastore_api.c:1007
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1068
+#: src/service/datastore/datastore_api.c:1068
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1113
+#: src/service/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1171
+#: src/service/datastore/datastore_api.c:1171
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1230
+#: src/service/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1276
+#: src/service/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/service/datastore/datastore_api.c:1357
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:257
-#, fuzzy, c-format
-msgid "Error queueing datastore GET operation\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
-#, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/datastore/gnunet-datastore.c:319
-#, fuzzy, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/datastore/gnunet-datastore.c:331
-#, c-format
-msgid "Inserted %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:378
-#, fuzzy, c-format
-msgid "Error queueing datastore PUT operation\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/datastore/gnunet-datastore.c:454
-#, c-format
-msgid "Please choose at least one operation: %s, %s\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:477
-#, fuzzy
-msgid "Dump all records from the datastore"
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/datastore/gnunet-datastore.c:482
-#, fuzzy
-msgid "Insert records into the datastore"
-msgstr "# các byte trong kho dữ liệu"
-
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:498
-#, fuzzy
-msgid "Manipulate GNUnet datastore"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
-#: src/datastore/gnunet-service-datastore.c:335
+#: src/service/datastore/gnunet-service-datastore.c:335
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:419
+#: src/service/datastore/gnunet-service-datastore.c:419
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:551
+#: src/service/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:593
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:612
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:619
+#: src/service/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:693
+#: src/service/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:743
+#: src/service/datastore/gnunet-service-datastore.c:743
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:858
+#: src/service/datastore/gnunet-service-datastore.c:858
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/service/datastore/gnunet-service-datastore.c:888
 #, fuzzy
 msgid "# GET KEY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:899
+#: src/service/datastore/gnunet-service-datastore.c:899
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:940
+#: src/service/datastore/gnunet-service-datastore.c:940
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:971
+#: src/service/datastore/gnunet-service-datastore.c:971
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1012
+#: src/service/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1019
+#: src/service/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/service/datastore/gnunet-service-datastore.c:1058
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/service/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/service/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/service/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/service/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/service/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/service/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/service/datastore/gnunet-service-datastore.c:1573
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/plugin_datastore_heap.c:895
+#: src/service/datastore/plugin_datastore_heap.c:895
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
+#: src/service/datastore/plugin_datastore_postgres.c:811
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/service/datastore/plugin_datastore_sqlite.c:87
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:634
+#: src/service/datastore/plugin_datastore_sqlite.c:634
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
+#: src/service/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
 #, fuzzy
 msgid "error preparing statement\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
 #, fuzzy
 msgid "error stepping\n"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "kho dữ liệu sqlite"
-
-#: src/datastore/plugin_datastore_template.c:252
+#: src/service/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:167
-#, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, fuzzy, c-format
-msgid "Failed to connect to DHT service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/dht/gnunet-dht-get.c:256
-msgid "Issuing DHT GET with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-msgid "use DHT's record route option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:925
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "số lần lặp lại"
-
-#: src/dht/gnunet_dht_profiler.c:964
+#: src/service/dht/gnunet_dht_profiler.c:964
 msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:976
+#: src/service/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
+#: src/service/dht/gnunet_dht_profiler.c:982
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
+#: src/service/dht/gnunet_dht_profiler.c:988
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
+#: src/service/dht/gnunet_dht_profiler.c:993
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
+#: src/service/dht/gnunet_dht_profiler.c:999
 msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
+#: src/service/dht/gnunet_dht_profiler.c:1005
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
+#: src/service/dht/gnunet_dht_profiler.c:1026
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:387
+#: src/service/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:240
+#: src/service/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:246
+#: src/service/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:259
+#: src/service/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:463
+#: src/service/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:617
+#: src/service/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:753
+#: src/service/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:829
+#: src/service/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:951
+#: src/service/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:970
+#: src/service/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:993
+#: src/service/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/service/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1066
+#: src/service/dns/gnunet-service-dns.c:1066
 #, 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:1114 src/exit/gnunet-daemon-exit.c:3704
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dns/gnunet-service-dns.c:1125
+#: src/service/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/service/exit/gnunet-daemon-exit.c:968
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1074
+#: src/service/exit/gnunet-daemon-exit.c:1074
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1368
+#: src/service/exit/gnunet-daemon-exit.c:1368
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1504
+#: src/service/exit/gnunet-daemon-exit.c:1504
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/service/exit/gnunet-daemon-exit.c:1616
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1658
+#: src/service/exit/gnunet-daemon-exit.c:1658
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1749
+#: src/service/exit/gnunet-daemon-exit.c:1749
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1837
+#: src/service/exit/gnunet-daemon-exit.c:1837
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1876
+#: src/service/exit/gnunet-daemon-exit.c:1876
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2017
+#: src/service/exit/gnunet-daemon-exit.c:2017
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2287
+#: src/service/exit/gnunet-daemon-exit.c:2287
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/service/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636
+#: src/service/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:2828
+#: src/service/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2837
+#: src/service/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2913
+#: src/service/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2987
+#: src/service/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3036
+#: src/service/exit/gnunet-daemon-exit.c:3036
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3051
+#: src/service/exit/gnunet-daemon-exit.c:3051
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:3078
+#: src/service/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/service/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/service/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/service/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/service/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/service/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3661
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3832
+#: src/service/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3948
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4114
+#: src/service/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fs/fs_api.c:481
+#: src/service/fs/fs_api.c:481
 #, 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:492
+#: src/service/fs/fs_api.c:492
 #, 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:500
+#: src/service/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1157
+#: src/service/fs/fs_api.c:1157
 #, 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:1708
+#: src/service/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1723
+#: src/service/fs/fs_api.c:1723
 #, 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:2452
+#: src/service/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2463
+#: src/service/fs/fs_api.c:2463
 #, 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:2611 src/fs/fs_api.c:2857
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
 #, 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:2629
+#: src/service/fs/fs_api.c:2629
 #, 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:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2847
+#: src/service/fs/fs_api.c:2847
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3108
+#: src/service/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:216
+#: src/service/fs/fs_directory.c:216
 #, fuzzy
 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:311
+#: src/service/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:333
+#: src/service/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:347
+#: src/service/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, 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:961
+#: src/service/fs/fs_download.c:961
 #, 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:1045
+#: src/service/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1067
+#: src/service/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1090
+#: src/service/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1101
+#: src/service/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1111
+#: src/service/fs/fs_download.c:1111
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1219
+#: src/service/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1890
+#: src/service/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/fs/fs_getopt.c:237
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2289,5432 +5469,2334 @@ msgstr ""
 "Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
 "siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_list_indexed.c:191
+#: src/service/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_misc.c:129
+#: src/service/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:203
+#: src/service/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:234
+#: src/service/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:331
+#: src/service/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:458
+#: src/service/fs/fs_namespace.c:458
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:732
+#: src/service/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "Không thể mở tập tin « %s »: « %s »"
 
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:791
+#: src/service/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/fs/fs_publish.c:837
+#: src/service/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:857
+#: src/service/fs/fs_publish.c:857
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:889
+#: src/service/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/service/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/service/fs/fs_publish.c:1108
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:1116
+#: src/service/fs/fs_publish.c:1116
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:1157
+#: src/service/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1397
+#: src/service/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "Kho dữ liệu đầy.\n"
 
-#: src/fs/fs_publish.c:1489
+#: src/service/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:213
+#: src/service/fs/fs_publish_ksk.c:213
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_publish_ublock.c:215
+#: src/service/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:994
+#: src/service/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/service/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:69
+#: src/service/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:276
+#: src/service/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/fs/fs_unindex.c:327
+#: src/service/fs/fs_unindex.c:327
 #, 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:377 src/fs/fs_unindex.c:390
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/fs/fs_unindex.c:386
+#: src/service/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_unindex.c:447
+#: src/service/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:670
+#: src/service/fs/fs_unindex.c:670
 #, 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:709
+#: src/service/fs/fs_unindex.c:709
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:232
+#: src/service/fs/fs_uri.c:232
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:291
+#: src/service/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:309
+#: src/service/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
+#: src/service/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:383
+#: src/service/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:424
+#: src/service/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:441
+#: src/service/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
+#: src/service/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:535
+#: src/service/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/service/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/service/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:562
+#: src/service/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:568
+#: src/service/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/service/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/service/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/service/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:599
+#: src/service/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:613
+#: src/service/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:646
+#: src/service/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_uri.c:666
+#: src/service/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1094
+#: src/service/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/fs/gnunet-auto-share.c:234
-#, fuzzy, c-format
-msgid "Failed to load state: %s\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
-#, fuzzy, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:480
-#, fuzzy, c-format
-msgid "Publishing `%s'\n"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
-
-#: src/fs/gnunet-auto-share.c:491
-#, fuzzy, c-format
-msgid "Failed to run `%s'\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/fs/gnunet-auto-share.c:661
-#, fuzzy, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
-msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
-
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-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-auto-share.c:718
-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-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:761
-#, fuzzy
-msgid "Automatically publish files from a directory on GNUnet"
-msgstr "Tự động chia sẻ một thư mục."
-
-#: src/fs/gnunet-daemon-fsprofiler.c:668
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:106
-#, fuzzy, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr "==> Thư mục « %s »:\n"
-
-#: src/fs/gnunet-directory.c:109
-#, fuzzy, c-format
-msgid "Directory `%s' contents:\n"
-msgstr "==> Thư mục « %s »:\n"
-
-#: src/fs/gnunet-directory.c:146
-#, fuzzy
-msgid "You must specify a filename to inspect.\n"
-msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
-
-#: src/fs/gnunet-directory.c:160
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/fs/gnunet-directory.c:170
-#, fuzzy, c-format
-msgid "`%s' 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/gnunet-directory.c:201
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
-
-#: src/fs/gnunet-download.c:131
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/fs/gnunet-download.c:143
-#, fuzzy
-msgid "<unknown time>"
-msgstr "Lỗi không rõ"
-
-#: src/fs/gnunet-download.c:155
-#, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:177
-#, fuzzy, c-format
-msgid "Error downloading: %s.\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/fs/gnunet-download.c:189
-#, fuzzy, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
-
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
-#, fuzzy, c-format
-msgid "Unexpected status: %d\n"
-msgstr "Gặp sự kiện bất thường: %d\n"
-
-#: src/fs/gnunet-download.c:234
-#, fuzzy
-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:240 src/fs/gnunet-publish.c:716
-#, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "Tập tin « %s » có URI: %s\n"
-
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/fs/gnunet-download.c:319
-#, fuzzy
-msgid "set the desired LEVEL of receiver-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-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
-
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
-msgstr "ghi tập tin vào TÊN_TẬP_TIN"
-
-#: src/fs/gnunet-download.c:343
-#, fuzzy
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
-
-#: src/fs/gnunet-download.c:350
-#, fuzzy
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
-
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
-msgstr "tải xuống đệ quy một thư mục GNUnet"
-
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/service/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:218
+#: src/service/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:225
+#: src/service/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:237
+#: src/service/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Tùy chọn chia sẻ tập tin"
-
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:247
-#, fuzzy, c-format
-msgid "Error publishing: %s.\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:259
-#, fuzzy, c-format
-msgid "URI is `%s'.\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
-
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
-
-#: src/fs/gnunet-publish.c:280
-#, fuzzy
-msgid "Starting cleanup after abort\n"
-msgstr "Hoàn thành khởi chạy « %s ».\n"
-
-#: src/fs/gnunet-publish.c:287
-#, fuzzy
-msgid "Cleanup after abort completed.\n"
-msgstr "Hoàn thành khởi chạy « %s ».\n"
-
-#: src/fs/gnunet-publish.c:292
-#, fuzzy
-msgid "Cleanup after abort failed.\n"
-msgstr "Hoàn thành khởi chạy « %s ».\n"
-
-#: src/fs/gnunet-publish.c:426
-#, 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:428
-#, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "Từ khoá cho tập tin « %s »:\n"
-
-#: src/fs/gnunet-publish.c:583
-#, fuzzy
-msgid "Could not publish\n"
-msgstr "Không thể truy cập đến « %s »: %s\n"
-
-#: src/fs/gnunet-publish.c:612
-#, 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:645
-#, 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:647
-#, fuzzy, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/fs/gnunet-publish.c:653
-#, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:659
-msgid "Preprocessing complete.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:665
-#, 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:671
-msgid "Meta data extraction has finished.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "=\tLỗi đọc thư mục.\n"
-
-#: src/fs/gnunet-publish.c:706
-#, fuzzy, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#: src/fs/gnunet-publish.c:738
-#, 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:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:811
-#, 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:818
-#, 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:824
-#, 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:833 src/vpn/gnunet-vpn.c:208
-#, 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:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
-#, 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:907
-#, fuzzy
-msgid "enable 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:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-"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:921
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
-msgstr ""
-"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:928
-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-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-"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:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
-"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:953
-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:965
-#, fuzzy
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
-msgstr ""
-"chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
-
-#: src/fs/gnunet-publish.c:972
-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:980
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
-msgstr ""
-"Đị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:998
-msgid "Publish a file or directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-search.c:446
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:535
-#, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:602
-#, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:608
-#, c-format
-msgid "An output file is mandatory for silent mode.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:629
-#, fuzzy
-msgid "Could not create keyword URI from arguments.\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:662
-#, fuzzy, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/fs/gnunet-search.c:676
-#, fuzzy
-msgid "Could not start searching.\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/fs/gnunet-search.c:702
-#, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
-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-search.c:708
-msgid "do not search, print only the URI that points to this search"
-msgstr ""
-
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:733
-msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
-msgstr ""
-
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
-msgstr ""
-
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
-msgstr ""
-
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
-msgstr ""
-
-#: src/fs/gnunet-search.c:776
-#, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-#, fuzzy
-msgid "Search for files that have been published on GNUnet\n"
-msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
-
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs.c:423
+#: src/service/fs/gnunet-service-fs.c:423
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:785
+#: src/service/fs/gnunet-service-fs.c:785
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs.c:825
+#: src/service/fs/gnunet-service-fs.c:825
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/service/fs/gnunet-service-fs.c:995
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1237
+#: src/service/fs/gnunet-service-fs.c:1237
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
 #, fuzzy
 msgid "# queries received via CADET not answered"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
 #, fuzzy
 msgid "# Blocks transferred via cadet"
 msgstr "# các byte được gửi"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:539
+#: src/service/fs/gnunet-service-fs_cp.c:539
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:671
+#: src/service/fs/gnunet-service-fs_cp.c:671
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:868
+#: src/service/fs/gnunet-service-fs_cp.c:868
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/service/fs/gnunet-service-fs_cp.c:893
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:903
+#: src/service/fs/gnunet-service-fs_cp.c:903
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1000
+#: src/service/fs/gnunet-service-fs_cp.c:1000
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1058
+#: src/service/fs/gnunet-service-fs_cp.c:1058
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1082
+#: src/service/fs/gnunet-service-fs_cp.c:1082
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1096
+#: src/service/fs/gnunet-service-fs_cp.c:1096
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/service/fs/gnunet-service-fs_cp.c:1153
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1197
+#: src/service/fs/gnunet-service-fs_cp.c:1197
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1541
+#: src/service/fs/gnunet-service-fs_cp.c:1541
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/service/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/service/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:296
+#: src/service/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/service/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/service/fs/gnunet-service-fs_indexing.c:328
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:260
+#: src/service/fs/gnunet-service-fs_pe.c:260
 #, fuzzy
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:422
+#: src/service/fs/gnunet-service-fs_pe.c:422
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/service/fs/gnunet-service-fs_pe.c:433
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:462
+#: src/service/fs/gnunet-service-fs_pe.c:462
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/fs/gnunet-service-fs_pe.c:530
+#: src/service/fs/gnunet-service-fs_pe.c:530
 #, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:540
+#: src/service/fs/gnunet-service-fs_pe.c:540
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:305
+#: src/service/fs/gnunet-service-fs_pr.c:305
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:795
+#: src/service/fs/gnunet-service-fs_pr.c:795
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:869
+#: src/service/fs/gnunet-service-fs_pr.c:869
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/service/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1032
+#: src/service/fs/gnunet-service-fs_pr.c:1032
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1073
+#: src/service/fs/gnunet-service-fs_pr.c:1073
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/service/fs/gnunet-service-fs_pr.c:1228
 #, fuzzy
 msgid "# Replies received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/service/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1433
+#: src/service/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1488
+#: src/service/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1503
+#: src/service/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1526
+#: src/service/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/service/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/service/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1570
+#: src/service/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1616
+#: src/service/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629
+#: src/service/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/service/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1744
+#: src/service/fs/gnunet-service-fs_pr.c:1744
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_push.c:643
+#: src/service/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:94
-#, fuzzy, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
-
-#: src/fs/gnunet-unindex.c:103
-#, fuzzy, c-format
-msgid "Error unindexing: %s.\n"
-msgstr ""
-"\n"
-"Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
-
-#: src/fs/gnunet-unindex.c:109
-#, fuzzy
-msgid "Unindexing done.\n"
-msgstr "Bỏ chỉ mục tập tin."
-
-#: src/fs/gnunet-unindex.c:142
-#, fuzzy, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
-
-#: src/fs/gnunet-unindex.c:162
-#, fuzzy
-msgid "Could not start unindex operation.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
-msgstr ""
-
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
 msgid "metadata length"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
+#: src/service/fs/meta_data.c:1073
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr ""
 
-#: src/fs/meta_data.c:1092
+#: src/service/fs/meta_data.c:1092
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/fs/meta_data.c:1124
+#: src/service/fs/meta_data.c:1124
 #, c-format
 msgid "Serialized %ld bytes of metadata"
 msgstr ""
 
-#: src/fs/meta_data.c:1131
+#: src/service/fs/meta_data.c:1131
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "Lỗi không rõ.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
-#, fuzzy
-msgid "Ego not found."
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "Lỗi không rõ.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-#, fuzzy
-msgid "Zone iteration failed."
-msgstr "# các khoá phiên chạy được chấp nhận"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
-#, fuzzy
-msgid "Zone not found."
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
-#, fuzzy
-msgid "Record not found."
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
-#, fuzzy
-msgid "Zone does not contain any records."
-msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "chưa đưa ra tên"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
-#, fuzzy
-msgid "No label given."
-msgstr "chưa đưa ra tên"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "chưa đưa ra tên"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
-#: src/gns/gns_tld_api.c:292
+#: src/service/gns/gns_tld_api.c:292
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
+#: src/service/gns/gnunet-bcd.c:573
 #, fuzzy, c-format
 msgid "Invalid port number %u\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
 msgid "Unable to set up the daemon\n"
 msgstr "Không thể tạo tài khoản người dùng cho trình nền."
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-bcd.c:660
+#: src/service/gns/gnunet-bcd.c:660
 msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
+#: src/service/gns/gnunet-bcd.c:669
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
+#: src/service/gns/gnunet-dns2gns.c:296
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:377
+#: src/service/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/service/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/service/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/service/gns/gnunet-dns2gns.c:670
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/service/gns/gnunet-dns2gns.c:678
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:839
+#: src/service/gns/gnunet-dns2gns.c:839
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:999
+#: src/service/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1016
+#: src/service/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
+#: src/service/gns/gnunet-gns-benchmark.c:582
 msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
+#: src/service/gns/gnunet-gns-benchmark.c:588
 msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
+#: src/service/gns/gnunet-gns-benchmark.c:593
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
+#: src/service/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:979
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/service/gns/gnunet-gns-proxy.c:2654
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/service/gns/gnunet-gns-proxy.c:2686
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/service/gns/gnunet-gns-proxy.c:2895
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/service/gns/gnunet-gns-proxy.c:3268
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/service/gns/gnunet-gns-proxy.c:3300
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3868
+#: src/service/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3873
+#: src/service/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3877
+#: src/service/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
+#: src/service/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "« %s » không sẵn sàng.\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:351
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Bản ghi lỗi GNUnet"
-
-#: src/gns/gnunet-service-gns.c:518
+#: src/service/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
 #, fuzzy
 msgid "Error converting GNS response to DNS response!\n"
 msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:900
+#: src/service/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:213
-#, fuzzy, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:230
-#, fuzzy, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:254
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gns/plugin_rest_gns.c:450
-#, fuzzy
-msgid "Gns REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, fuzzy, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, fuzzy, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, fuzzy, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
-#, fuzzy, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
-#, fuzzy, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
-#, fuzzy, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/hello/gnunet-hello.c:303
-#, fuzzy, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/hello/gnunet-hello.c:310
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:315
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
-#, fuzzy, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/hello/gnunet-hello.c:339
-#, fuzzy, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
-msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n"
-
-#: src/hello/gnunet-hello.c:386
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/hello/gnunet-hello.c:395
-#, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:409
-msgid "Hello file to read"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:418
-#, fuzzy
-msgid "Print information about peers."
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/hello/hello.c:1089
-#, fuzzy
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "Lỗi lưu cấu hình."
-
-#: src/hello/hello.c:1099
-#, fuzzy
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "Lỗi lưu cấu hình."
-
-#: src/hello/hello.c:1109
-#, fuzzy
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/hello/hello.c:1121
-#, fuzzy
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/hello/hello.c:1139
-#, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr ""
-
-#: src/hello/hello.c:1147
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr ""
-
-#: src/hello/hello.c:1162
-#, fuzzy, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "Lỗi đóng kết đến cổng %s %d.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist.c:306
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
-#, fuzzy, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-msgid "Expired HELLO encountered (ignored)"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, fuzzy, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
 #, fuzzy
 msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, 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/gnunet-daemon-hostlist_server.c:709
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, 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"
 
-#: src/identity/gnunet-identity.c:225
-#, fuzzy, c-format
-msgid "Failed to create ego: %s\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
-msgstr ""
-
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:576
-msgid "reduce output"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:597
-#, fuzzy
-msgid "display private keys as well"
-msgstr "hiển thị giá trị tổng kiểm của tập tin"
-
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
-msgstr ""
-
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/identity/gnunet-service-identity.c:921
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/identity/gnunet-service-identity.c:979
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/identity/gnunet-service-identity.c:988
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/plugin_rest_identity.c:1245
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namecache/gnunet-namecache.c:105
-#, fuzzy, c-format
-msgid "No records found for `%s'"
-msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
-
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:174
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
-
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/namecache/gnunet-namecache.c:187
-#, fuzzy, c-format
-msgid "You must specify a name\n"
-msgstr "Phải ghi rõ tên hiệu\n"
-
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:220
-#, fuzzy
-msgid "specifies the public key of the zone to look in"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "Cấu hình GNUnet"
-
-#: src/namecache/namecache_api.c:283
+#: src/service/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:371
+#: src/service/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/namecache/plugin_namecache_flat.c:404
-#, fuzzy
-msgid "flat plugin running\n"
-msgstr "kho dữ liệu sqlite"
-
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "Lỗi chạy %s: %s %d\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "Cấu hình GNUnet"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
 #, fuzzy
 msgid "no errors"
 msgstr "Lỗi không rõ"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, fuzzy, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr "Đã tạo mục nhập « %s » trong không gian tên « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
 #, fuzzy
 msgid "unable to store record"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
 msgid "invalid parameters"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
 #, fuzzy
 msgid "invalid name"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
 #, fuzzy
 msgid "unable to parse key"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
 #, fuzzy
 msgid "No expiration specified for records.\n"
 msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "« %s » không phải là một tập tin.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "Tập tin « %s » có URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "Tập tin « %s » có URI: %s\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, fuzzy, c-format
-msgid "Data `%s' invalid\n"
-msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "Không rõ câu lệnh « %s ».\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "Gặp lỗi khi lưu cấu hình."
-
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/namestore/gnunet-namestore.c:668
-#, fuzzy, c-format
-msgid "Adding record failed: %s\n"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
-
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1356
-#, fuzzy, c-format
-msgid "No options given\n"
-msgstr "chưa đưa ra tên"
-
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/namestore/gnunet-namestore.c:1381
-#, fuzzy
-msgid "name"
-msgstr "không-tên"
-
-#: src/namestore/gnunet-namestore.c:1410
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1461
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-
-#: src/namestore/gnunet-namestore.c:1471
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1491
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, fuzzy, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1642
-#, fuzzy, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1679
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
-#: src/namestore/gnunet-namestore.c:1967
-#, fuzzy, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2010
-#, fuzzy
-msgid "set the desired nick name for the zone"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/namestore/gnunet-namestore.c:2015
-#, fuzzy
-msgid "monitor changes in the namestore"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/namestore/gnunet-namestore.c:2025
-#, fuzzy
-msgid "Output in recordline format"
-msgstr "kết xuất theo định dạng gnuplot"
-
-#: src/namestore/gnunet-namestore.c:2031
-#, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2056
-msgid "omit private records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:792
-#, fuzzy
-msgid "Flat file database running\n"
-msgstr "kho dữ liệu sqlite"
-
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "Lỗi chạy %s: %s %d\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:956
-#, fuzzy
-msgid "SQlite database running\n"
-msgstr "kho dữ liệu sqlite"
-
-#: src/namestore/plugin_rest_namestore.c:1320
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:189
-#, fuzzy
-msgid "Suggested configuration changes:\n"
-msgstr ""
-"\n"
-"CHƯA lưu các thay đổi trong cấu hình.\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "Lỗi lưu cấu hình."
-
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, fuzzy, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:327
-#, fuzzy
-msgid "run autoconfiguration"
-msgstr "Cấu hình hạn ngạch"
-
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "write configuration file (for autoconfiguration)"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:355
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr "Cấu hình GNUnet"
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
+#: src/service/nat-auto/nat_auto_api.c:73
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/service/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
+#: src/service/nat-auto/nat_auto_api.c:79
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/service/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
+#: src/service/nat-auto/nat_auto_api.c:85
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/service/nat-auto/nat_auto_api.c:88
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:91
+#: src/service/nat-auto/nat_auto_api.c:91
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/service/nat-auto/nat_auto_api.c:94
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:97
+#: src/service/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/service/nat-auto/nat_auto_api.c:100
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:103
+#: src/service/nat-auto/nat_auto_api.c:103
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/service/nat-auto/nat_auto_api.c:106
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:109
+#: src/service/nat-auto/nat_auto_api.c:109
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
+#: src/service/nat-auto/nat_auto_api.c:113
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nat-auto/nat_auto_api.c:116
+#: src/service/nat-auto/nat_auto_api.c:116
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:119
+#: src/service/nat-auto/nat_auto_api.c:119
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
+#: src/service/nat-auto/nat_auto_api.c:122
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
+#: src/service/nat-auto/nat_auto_api.c:125
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
+#: src/service/nat-auto/nat_auto_api.c:128
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/nat-auto/nat_auto_api_test.c:489
+#: src/service/nat-auto/nat_auto_api_test.c:489
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:464
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr ""
-
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/nat/gnunet-service-nat.c:1362
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1861
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1935
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/gnunet-service-nat_mini.c:188
+#: src/service/nat/gnunet-service-nat_mini.c:188
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:602
+#: src/service/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/service/nse/gnunet-nse-profiler.c:857
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/nse/gnunet-nse-profiler.c:864
+#: src/service/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:879
+#: src/service/nse/gnunet-nse-profiler.c:879
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:888
+#: src/service/nse/gnunet-nse-profiler.c:888
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/service/nse/gnunet-nse-profiler.c:900
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:912
+#: src/service/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-nse.c:124
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-#, fuzzy
-msgid "Value is too large.\n"
-msgstr "Giá trị không nằm trong phạm vi được phép."
-
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/service/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:657
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:688
+#: src/service/peerstore/gnunet-service-peerstore.c:692
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
 
-#: src/peerstore/peerstore_api.c:781
+#: src/service/peerstore/peerstore_api.c:781
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/peerstore_api.c:895
+#: src/service/peerstore/peerstore_api.c:895
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/pt/gnunet-daemon-pt.c:416
+#: src/service/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:422
+#: src/service/pt/gnunet-daemon-pt.c:422
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:476
+#: src/service/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:671
+#: src/service/pt/gnunet-daemon-pt.c:671
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:678
+#: src/service/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/service/pt/gnunet-daemon-pt.c:716
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:771
+#: src/service/pt/gnunet-daemon-pt.c:771
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:777
+#: src/service/pt/gnunet-daemon-pt.c:777
 #, fuzzy
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:786
+#: src/service/pt/gnunet-daemon-pt.c:786
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/service/pt/gnunet-daemon-pt.c:881
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:898
+#: src/service/pt/gnunet-daemon-pt.c:898
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/pt/gnunet-daemon-pt.c:1314
+#: src/service/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:805
-#, fuzzy, c-format
-msgid "Ego is required\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#: src/reclaim/gnunet-reclaim.c:812
-#, c-format
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:819
-#, fuzzy, c-format
-msgid "Requesting party key is required!\n"
-msgstr "đặt tên hiệu cần dùng (cần thiết)"
-
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:852
-#, fuzzy
-msgid "The EGO to use"
-msgstr "kích cỡ tin nhắn"
-
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
-msgstr ""
-
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-#, fuzzy
-msgid "OpenID Connect REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/reclaim/reclaim_api.c:544
+#: src/service/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1365
+#: src/service/regex/gnunet-regex-profiler.c:1365
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1421
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/service/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1450
+#: src/service/regex/gnunet-regex-profiler.c:1450
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1539
+#: src/service/regex/gnunet-regex-profiler.c:1539
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1546
+#: src/service/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1552
+#: src/service/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
+#: src/service/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1566
+#: src/service/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1581
+#: src/service/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:151
+#: src/service/regex/regex_api_announce.c:151
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/regex/regex_api_search.c:200
+#: src/service/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:1369
+#: src/service/rest/gnunet-rest-server.c:1369
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/rest/plugin_rest_config.c:428
-#, fuzzy
-msgid "CONFIG REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/rest/plugin_rest_copying.c:211
-#, fuzzy
-msgid "COPYING REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/revocation/gnunet-revocation.c:146
-#, fuzzy, c-format
-msgid "Key `%s' is valid\n"
-msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
-
-#: src/revocation/gnunet-revocation.c:150
-#, fuzzy, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr "Dịch vụ đã bị xoá.\n"
-
-#: src/revocation/gnunet-revocation.c:154
-#, fuzzy
-msgid "Internal error\n"
-msgstr "Lỗi VR."
-
-#: src/revocation/gnunet-revocation.c:180
-#, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:183
-#, fuzzy
-msgid "Revocation failed (!)\n"
-msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
-
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:334
-#, fuzzy, c-format
-msgid "Ego `%s' not found.\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/revocation/gnunet-revocation.c:350
-#, fuzzy, c-format
-msgid "Error: Key is invalid\n"
-msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n"
-
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:424
-#, fuzzy, c-format
-msgid "Public key `%s' malformed\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:464
-#, fuzzy
-msgid "No filename to store revocation certificate given.\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/revocation/gnunet-revocation.c:481
-#, fuzzy, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/revocation/gnunet-revocation.c:511
-#, fuzzy
-msgid "No action specified. Nothing to do.\n"
-msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
-
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:558
-#, fuzzy
-msgid "number of epochs to calculate for"
-msgstr "số lần lặp lại"
-
-#: src/revocation/gnunet-service-revocation.c:539
+#: src/service/revocation/gnunet-service-revocation.c:539
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:549
+#: src/service/revocation/gnunet-service-revocation.c:549
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
+#: src/service/revocation/gnunet-service-revocation.c:558
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/revocation/gnunet-service-revocation.c:566
+#: src/service/revocation/gnunet-service-revocation.c:566
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/revocation/gnunet-service-revocation.c:604
+#: src/service/revocation/gnunet-service-revocation.c:604
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
+#: src/service/revocation/gnunet-service-revocation.c:959
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3148
-#, fuzzy
-msgid "timeout for the profiling"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/rps/gnunet-rps-profiler.c:3153
-#, fuzzy
-msgid "number of PeerIDs to request"
-msgstr "số lần lặp lại"
-
-#: src/rps/gnunet-rps-profiler.c:3170
-#, fuzzy
-msgid "Measure quality and performance of the RPS service."
-msgstr "Không thể truy cập đến dịch vụ"
-
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-#, fuzzy
-msgid "You must specify at least one message ID to check!\n"
-msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, fuzzy, c-format
-msgid "Malformed input, could not parse `%s'\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-#, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr " Không kết nối được (lỗi ?)\n"
-
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-#, fuzzy
-msgid "number of peers in consensus"
-msgstr "số lần lặp lại"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "số lần lặp lại"
-
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "số lần lặp lại"
-
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-#, fuzzy
-msgid "number of values"
-msgstr "số lần lặp lại"
-
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-msgid "write statistics to file"
-msgstr ""
-
-#: src/seti/gnunet-seti-profiler.c:457
+#: src/service/seti/gnunet-seti-profiler.c:457
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
-msgstr ""
-
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
-msgstr ""
-
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, fuzzy, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:577
-#, fuzzy, c-format
-msgid "No subsystem or name given\n"
-msgstr "chưa đưa ra tên"
-
-#: src/statistics/gnunet-statistics.c:589
-#, fuzzy, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/statistics/gnunet-statistics.c:725
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/statistics/gnunet-statistics.c:742
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/statistics/gnunet-statistics.c:751
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:783
-#, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
-msgstr "In ra thống kê về các thao tác GNUnet."
-
-#: src/statistics/statistics_api.c:749
+#: src/service/statistics/statistics_api.c:749
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/testing/gnunet-testing.c:185
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:386
+#: src/service/testing/gnunet-testing.c:386
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:392
+#: src/service/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:400
+#: src/service/testing/gnunet-testing.c:400
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:407
+#: src/service/testing/gnunet-testing.c:407
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:415
+#: src/service/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
+#: src/service/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr ""
-
-#: src/testing/list-keys.c:92
+#: src/service/testing/list-keys.c:92
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/testing.c:291
+#: src/service/testing/testing.c:291
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:743
+#: src/service/testing/testing.c:743
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing.c:1217
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1226
+#: src/service/testing/testing.c:1226
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/testing/testing.c:1236
+#: src/service/testing/testing.c:1236
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1249
+#: src/service/testing/testing.c:1249
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1265
+#: src/service/testing/testing.c:1265
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing.c:1279
+#: src/service/testing/testing.c:1279
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:1307
+#: src/service/testing/testing.c:1307
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing.c:1413
+#: src/service/testing/testing.c:1413
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1664
+#: src/service/testing/testing.c:1664
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing.c:2795
+#: src/service/testing/testing.c:2795
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testing/testing.c:2803
+#: src/service/testing/testing.c:2803
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testing/testing.c:2811
+#: src/service/testing/testing.c:2811
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/topology/gnunet-daemon-topology.c:257
+#: src/service/topology/gnunet-daemon-topology.c:257
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:451
+#: src/service/topology/gnunet-daemon-topology.c:451
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:805
+#: src/service/topology/gnunet-daemon-topology.c:805
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:870
+#: src/service/topology/gnunet-daemon-topology.c:870
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/service/topology/gnunet-daemon-topology.c:1005
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-communicator-quic.c:1787
+#: src/service/transport/gnunet-communicator-quic.c:1787
 msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
+#: src/service/transport/gnunet-communicator-tcp.c:4071
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
+#: src/service/transport/gnunet-communicator-udp.c:3433
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
+#: src/service/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/gnunet-communicator-unix.c:1015
+#: src/service/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1138
+#: src/service/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/transport/gnunet-transport.c:406
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/transport/gnunet-transport.c:415
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/transport/gnunet-transport.c:454
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:477
+#: src/service/transport/gnunet-transport.c:477
 #, fuzzy
 msgid "Failed to list connections, timeout occurred\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/transport/gnunet-transport.c:504
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:537
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/transport/gnunet-transport.c:566
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:592
+#: src/service/transport/gnunet-transport.c:592
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/service/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/transport/gnunet-transport.c:654
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/transport/gnunet-transport.c:701
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1103
+#: src/service/transport/gnunet-transport.c:1103
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/transport/gnunet-transport.c:1199
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/transport/gnunet-transport.c:1214
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1242
+#: src/service/transport/gnunet-transport.c:1242
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1248
+#: src/service/transport/gnunet-transport.c:1248
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1301
+#: src/service/transport/gnunet-transport.c:1301
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1367
+#: src/service/transport/gnunet-transport.c:1367
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1373
+#: src/service/transport/gnunet-transport.c:1373
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/service/transport/gnunet-transport.c:1377
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1383
+#: src/service/transport/gnunet-transport.c:1383
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/transport/gnunet-transport.c:1395
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1399
+#: src/service/transport/gnunet-transport.c:1399
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1404
+#: src/service/transport/gnunet-transport.c:1404
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1408
+#: src/service/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
+#: src/service/transport/gnunet-transport.c:1414
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
+#: src/service/transport/gnunet-transport.c:1426
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/transport/transport_api2_communication.c:761
+#: src/service/transport/transport_api2_communication.c:761
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr ""
-
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
-
-#: src/util/bio.c:312
-#, fuzzy, c-format
-msgid "Invalid handle type while reading `%s'"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
-msgstr ""
-
-#: src/util/bio.c:345
-#, fuzzy, c-format
-msgid "%s (while reading `%s')"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/util/bio.c:350
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr ""
-
-#: src/util/bio.c:363
-#, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
-msgstr ""
-
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
-
-#: src/util/bio.c:773
-#, fuzzy, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
-msgstr ""
-
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:910
-#, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
-
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "LỖI"
-
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "CẢNH BÁO"
-
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
-msgstr ""
-
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "TIN"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "GỠ LỖI"
-
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr ""
-
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr ""
-
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr ""
-
-#: src/util/common_logging.c:1416
-#, 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/util/common_logging.c:1431
-#, fuzzy, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %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/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/configuration.c:1718
-#, fuzzy
-msgid "Not a valid relative time specification"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
-"Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
-"tập hợp các sự chọn được phép\n"
-
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:148
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "đặt tên hiệu cần dùng (cần thiết)"
-
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:263
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:554
-#, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
-
-#: src/util/crypto_ecc.c:677
-#, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
-
-#: src/util/crypto_ecc_setup.c:282
-#, fuzzy
-msgid "Could not load peer's private key\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
-
-#: src/util/crypto_rsa.c:908
-#, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
-
-#: src/util/crypto_rsa.c:1208
-#, 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"
-
-#: src/util/disk.c:843
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "Mong đợi « %s » là một thư mục.\n"
-
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
-
-#: src/util/dnsparser.c:910
-#, fuzzy, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/dnsstub.c:228
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
-
-#: src/util/dnsstub.c:371
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
-msgstr ""
-
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/dnsstub.c:509
-#, fuzzy, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
-
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
-
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
-
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
-
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: không nhận ra tùy chọn « --%s »\n"
-
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
-
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: tùy chọn không được phép -- %c\n"
-
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: tùy chọn không hợp lệ -- %c\n"
-
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
-
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
-
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
-
-#: src/util/getopt.c:971
-#, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr ""
-"Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
-
-#: src/util/getopt.c:984
-#, fuzzy, c-format
-msgid "Option `%s' can't be used with other options.\n"
-msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
-
-#: src/util/getopt.c:996
-#, fuzzy, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
-msgstr "hiển thị số thứ tự phiên bản"
-
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
-"ngắn.\n"
-
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
-msgstr "hiển thị trợ giúp này"
-
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
-msgstr "xuất chi tiết"
-
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
-msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
-
-#: src/util/getopt_helpers.c:446
-#, fuzzy
-msgid "configure logging to write logs to FILENAME"
-msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
-
-#: src/util/getopt_helpers.c:463
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/getopt_helpers.c:571
-#, fuzzy, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
-msgstr ""
-
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
-msgstr ""
-
-#: src/util/getopt_helpers.c:632
-#, fuzzy, c-format
-msgid "You must pass relative time to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/getopt_helpers.c:686
-#, fuzzy, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/getopt_helpers.c:743
-#, fuzzy, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:806
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:876
-#, fuzzy, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
-
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
-msgstr ""
-
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
-msgstr ""
-
-#: src/util/gnunet-config.c:192
-#, fuzzy
-msgid "Manipulate GNUnet configuration files"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:95
-#, fuzzy, c-format
-msgid "Failed to open `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/gnunet-ecc.c:129
-#, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:178
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
-msgstr "Lỗi chạy %s: %s %d\n"
-
-#: src/util/gnunet-ecc.c:185
-#, c-format
-msgid ""
-"\n"
-"Finished!\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:304
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' not found\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/util/gnunet-ecc.c:314
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' is empty\n"
-msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
-
-#: src/util/gnunet-ecc.c:334
-#, fuzzy, c-format
-msgid "Could not read hostkey file: %s\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:479
-msgid "print the public key in HEX format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:499
-#, fuzzy
-msgid "Manipulate GNUnet private ECC key files"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "Tập tin « %s » có URI: %s\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
-#: src/util/gnunet-qr.c:161
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
-
-#: src/util/gnunet-qr.c:171
-#, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:182
-#, c-format
-msgid "No known handler for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
-#, c-format
-msgid "Got %d images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
-#, fuzzy, c-format
-msgid "Found %s: \"%s\"\n"
-msgstr "Tôi là đồng đẳng « %s ».\n"
-
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
-
-#: src/util/gnunet-qr.c:546
-msgid "No data found\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
-msgstr ""
-
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
-msgstr ""
-
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:183
-msgid "Use built-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:215
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:313
-#, fuzzy
-msgid "Manipulate GNUnet proof of work files"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
-#: src/util/gnunet-service-resolver.c:1288
+#: src/service/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:95
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
-
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:109
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
-msgstr ""
-
-#: src/util/helper.c:304
-#, fuzzy, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/util/helper.c:356
-#, fuzzy, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/util/helper.c:571
-#, fuzzy, c-format
-msgid "Error writing to `%s': %s\n"
-msgstr "Gặp lỗi khi tạo người dùng"
-
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
-msgstr ""
-
-#: src/util/network.c:1284
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
-
-#: src/util/os_installation.c:416
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr ""
-
-#: src/util/os_installation.c:787
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/util/os_installation.c:820
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
-
-#: src/util/plugin.c:158
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
-
-#: src/util/plugin.c:215
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
-
-#: src/util/plugin.c:371
-#, fuzzy
-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/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/regex.c:123
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:243
-#, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:888
-#, fuzzy, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr "không quyết định các tên máy"
-
-#: src/util/resolver_api.c:901
-#, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
-
-#: src/util/resolver_api.c:1086
-msgid "Resolver not configured correctly.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr "Không thể giải quyết « %s » (%s): %s\n"
-
-#: src/util/service.c:654
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
-msgstr ""
-
-#: src/util/service.c:838
-#, fuzzy, c-format
-msgid "Unknown address family %d\n"
-msgstr "\tKhông rõ miền tên « %s »\n"
-
-#: src/util/service.c:951
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:992
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:1401
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
-
-#: src/util/service.c:1413
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
-
-#: src/util/service.c:1420
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
-
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr "Không có người dùng như vậy"
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
-
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/service.c:2099
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
-msgstr ""
-
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
-msgstr ""
-
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-"Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
-
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
-msgstr ""
-
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
-msgstr ""
-
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr ""
-
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr ""
-
-#: src/util/strings.c:1081
-#, fuzzy, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
-
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
-msgstr ""
-
-#: src/util/strings.c:1283
-#, fuzzy, c-format
-msgid "Malformed port policy `%s'\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/util/strings.c:1408
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
-
-#: src/util/strings.c:1459
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "Địa chỉ IP định dạng sai: %s\n"
-
-#: src/util/strings.c:1501
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
-
-#: src/util/strings.c:1551
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
-
-#: src/util/strings.c:1582
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "Mạng có định dạng sai « %s »: %s\n"
-
-#: src/util/time.c:901 src/util/time.c:929
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/util/time.c:937
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 #, fuzzy
 msgid "# Active channels"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 #, fuzzy
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 #, fuzzy
 msgid "# ICMP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 #, fuzzy
 msgid "# UDP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 #, fuzzy
 msgid "# TCP packets received from cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 #, fuzzy
 msgid "# Packets dropped (channel not yet online)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 #, 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:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:142
-#, fuzzy
-msgid "Error creating tunnel\n"
-msgstr "Hoàn thành tạo khoá.\n"
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense with 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/vpn/gnunet-vpn.c:202
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#: src/vpn/gnunet-vpn.c:216
-#, fuzzy, c-format
-msgid "Option `%s' or `%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/vpn/gnunet-vpn.c:239
-#, fuzzy, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "« %s » không sẵn sàng.\n"
-
-#: src/vpn/gnunet-vpn.c:258
-#, fuzzy, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "« %s » không sẵn sàng.\n"
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:334
-#, fuzzy
-msgid "service is offered via TCP"
-msgstr "# các byte đã nhận qua TCP"
-
-#: src/vpn/gnunet-vpn.c:339
-#, fuzzy
-msgid "service is offered via UDP"
-msgstr "# các byte đã nhận qua UDP"
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr ""
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 384462693..734c57f60 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2023-10-16 12:34+0200\n"
+"POT-Creation-Date: 2023-10-19 16:42+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,575 +16,2464 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:392 src/namestore/gnunet-namestore-zonefile.c:193
-#: src/namestore/gnunet-namestore-zonefile.c:657
-#: src/namestore/gnunet-namestore-zonefile.c:676
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:407 src/abd/gnunet-abd.c:909
-#, fuzzy, c-format
-msgid "Issuer public key `%s' is not well-formed\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1750
-#: src/namestore/gnunet-namestore-fcfsd.c:1089
-#: src/namestore/gnunet-namestore.c:1959
-#, fuzzy, c-format
-msgid "Failed to connect to namestore\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/abd/gnunet-abd.c:566
-msgid "Ego does not exist!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:850 src/abd/gnunet-abd.c:900
-#, fuzzy, c-format
-msgid "Issuer public key not well-formed\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/abd/gnunet-abd.c:859 src/abd/gnunet-abd.c:918
-#, fuzzy, c-format
-msgid "Failed to connect to ABD\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/abd/gnunet-abd.c:865
-#, c-format
-msgid "You must provide issuer the attribute\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:872
-#, c-format
-msgid "ego required\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:882
-#, c-format
-msgid "Subject public key needed\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:890
-#, fuzzy, c-format
-msgid "Subject public key `%s' is not well-formed\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/abd/gnunet-abd.c:924
-#, c-format
-msgid "You must provide issuer and subject attributes\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:983
-#, c-format
-msgid "Please specify name to lookup, subject key and issuer key!\n"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1004
-msgid "verify credential against attribute"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1011
-msgid ""
-"The public key of the subject to lookup thecredential for, or for issuer "
-"side storage: subject and its attributes"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1018
-msgid "The private, signed delegate presented by the subject"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1025
-msgid "The public key of the authority to verify the credential against"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1030
-#, fuzzy
-msgid "The ego/zone name to use"
-msgstr "消息尺寸"
-
-#: src/abd/gnunet-abd.c:1036
-msgid "The issuer attribute to verify against or to issue"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1042
-msgid ""
-"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1047
-msgid "collect credentials"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1052
-msgid "Create and issue a credential issuer side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1057
-msgid "Issue a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1062
-msgid "Create, sign and return a credential subject side."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1069
-msgid "Import signed credentials that should be issued to a zone/ego"
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1073
-msgid "Create private record entry."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1079 src/abd/gnunet-abd.c:1085
-msgid "Indicates that the collect/verify process is done via forward search."
-msgstr ""
-
-#: src/abd/gnunet-abd.c:1098
-#, fuzzy
-msgid "GNUnet abd resolver tool"
-msgstr "GNUnet 错误日志"
-
-#: src/abd/gnunet-service-abd.c:1745 src/gns/gnunet-gns.c:291
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/abd/plugin_gnsrecord_abd.c:182
-#, fuzzy, c-format
-msgid "Unable to parse ATTR record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/arm/gnunet-arm.c:162
+#: src/cli/arm/gnunet-arm.c:162
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:168
+#: src/cli/arm/gnunet-arm.c:168
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/cli/arm/gnunet-arm.c:229
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:232
+#: src/cli/arm/gnunet-arm.c:232
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234
+#: src/cli/arm/gnunet-arm.c:234
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/cli/arm/gnunet-arm.c:250
 #, fuzzy
 msgid "is stopped"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:253
+#: src/cli/arm/gnunet-arm.c:253
 msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256
+#: src/cli/arm/gnunet-arm.c:256
 msgid "is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/cli/arm/gnunet-arm.c:259
 msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/cli/arm/gnunet-arm.c:262
 msgid "is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/cli/arm/gnunet-arm.c:265
 msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:268
+#: src/cli/arm/gnunet-arm.c:268
 msgid "is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/cli/arm/gnunet-arm.c:271
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:274
+#: src/cli/arm/gnunet-arm.c:274
 #, fuzzy
 msgid "service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:277
+#: src/cli/arm/gnunet-arm.c:277
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:279
+#: src/cli/arm/gnunet-arm.c:279
 #, fuzzy
 msgid "Unknown result code."
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:312
+#: src/cli/arm/gnunet-arm.c:312
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:341 src/arm/gnunet-arm.c:350
+#: src/cli/arm/gnunet-arm.c:341 src/cli/arm/gnunet-arm.c:350
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:388
+#: src/cli/arm/gnunet-arm.c:388
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:399
+#: src/cli/arm/gnunet-arm.c:399
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:440
+#: src/cli/arm/gnunet-arm.c:440
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:450
+#: src/cli/arm/gnunet-arm.c:450
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:490
+#: src/cli/arm/gnunet-arm.c:490
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:503
+#: src/cli/arm/gnunet-arm.c:503
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:549
+#: src/cli/arm/gnunet-arm.c:549
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:561
+#: src/cli/arm/gnunet-arm.c:561
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:603
+#: src/cli/arm/gnunet-arm.c:603
 msgid "All services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:607
+#: src/cli/arm/gnunet-arm.c:607
 msgid "Services (excluding stopped services):\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:664
+#: src/cli/arm/gnunet-arm.c:664
 #, fuzzy
 msgid "(No services configured.)\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:825
+#: src/cli/arm/gnunet-arm.c:825
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:861
+#: src/cli/arm/gnunet-arm.c:861
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:865
+#: src/cli/arm/gnunet-arm.c:865
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:869
+#: src/cli/arm/gnunet-arm.c:869
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:884
+#: src/cli/arm/gnunet-arm.c:884
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:974
+#: src/cli/arm/gnunet-arm.c:974
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:979
+#: src/cli/arm/gnunet-arm.c:979
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:984
+#: src/cli/arm/gnunet-arm.c:984
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:989
+#: src/cli/arm/gnunet-arm.c:989
 msgid "also show stopped services (used with -I)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:994
+#: src/cli/arm/gnunet-arm.c:994
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:999
+#: src/cli/arm/gnunet-arm.c:999
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:1004
+#: src/cli/arm/gnunet-arm.c:1004
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1008
+#: src/cli/arm/gnunet-arm.c:1008
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1012
+#: src/cli/arm/gnunet-arm.c:1012
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1019
+#: src/cli/arm/gnunet-arm.c:1019
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1024
+#: src/cli/arm/gnunet-arm.c:1024
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1029
+#: src/cli/arm/gnunet-arm.c:1029
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1034
+#: src/cli/arm/gnunet-arm.c:1034
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:1052
+#: src/cli/arm/gnunet-arm.c:1052
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:391
+#: src/cli/cadet/gnunet-cadet.c:606
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/cli/cadet/gnunet-cadet.c:685
+#, c-format
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:746
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cli/cadet/gnunet-cadet.c:775
+msgid "No action requested\n"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:800
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cli/cadet/gnunet-cadet.c:804
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:811
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cli/cadet/gnunet-cadet.c:817
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cli/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cli/cadet/gnunet-cadet.c:827
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cli/core/gnunet-core.c:91
+#, fuzzy
+msgid "fresh connection"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/cli/core/gnunet-core.c:95
+msgid "key sent"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:99
+msgid "key received"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:103
+#, fuzzy
+msgid "connection established"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/cli/core/gnunet-core.c:107
+msgid "rekeying"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:111
+#, fuzzy
+msgid "disconnected"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/cli/core/gnunet-core.c:120
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:124
+#, fuzzy
+msgid "unknown state"
+msgstr "未知错误"
+
+#: src/cli/core/gnunet-core.c:129
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:157
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cli/core/gnunet-core.c:163
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/core/gnunet-core.c:186 src/service/transport/gnunet-transport.c:1389
+msgid "provide information about all current connections (continuously)"
+msgstr ""
+
+#: src/cli/core/gnunet-core.c:196
+msgid "Print information about connected peers."
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:214
+#: src/cli/datastore/gnunet-datastore.c:226
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:257
+#, fuzzy, c-format
+msgid "Error queueing datastore GET operation\n"
+msgstr "创建用户出错"
+
+#: src/cli/datastore/gnunet-datastore.c:282
+#: src/cli/datastore/gnunet-datastore.c:400
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "发送消息失败。\n"
+
+#: src/cli/datastore/gnunet-datastore.c:319
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/cli/datastore/gnunet-datastore.c:331
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:339
+#: src/cli/datastore/gnunet-datastore.c:353
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:378
+#, fuzzy, c-format
+msgid "Error queueing datastore PUT operation\n"
+msgstr "创建用户出错"
+
+#: src/cli/datastore/gnunet-datastore.c:417
+#, c-format
+msgid "Input file is not of a supported format\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:442
+#, fuzzy, c-format
+msgid "Failed connecting to the datastore.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/datastore/gnunet-datastore.c:454
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:477
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr "发送消息失败。\n"
+
+#: src/cli/datastore/gnunet-datastore.c:482
+msgid "Insert records into the datastore"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:487
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/cli/datastore/gnunet-datastore.c:498
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "更改配置文件中的一个值"
+
+#: src/cli/dht/gnunet-dht-get.c:166
 #, c-format
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:412 src/arm/gnunet-service-arm.c:418
-#: src/util/service.c:1095 src/util/service.c:1101
+#: src/cli/dht/gnunet-dht-get.c:167
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Result %d, type %d:\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:452 src/util/client.c:531
-#: src/util/service.c:1134
+#: src/cli/dht/gnunet-dht-get.c:238
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:246 src/cli/dht/gnunet-dht-hello.c:119
+#: src/cli/dht/gnunet-dht-monitor.c:255
+#, fuzzy, c-format
+msgid "Failed to connect to DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/dht/gnunet-dht-get.c:256
+msgid "Issuing DHT GET with key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:293 src/cli/dht/gnunet-dht-monitor.c:302
+#: src/cli/dht/gnunet-dht-put.c:201
+msgid "the query key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:299
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:304 src/cli/dht/gnunet-dht-put.c:218
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:310 src/cli/dht/gnunet-dht-monitor.c:308
+msgid "the type of data to look for"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:316
+msgid "how long to execute this query before giving up?"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:322 src/cli/dht/gnunet-dht-put.c:207
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-get.c:339
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-hello.c:166
+msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:315
+msgid "how long should the monitor command run"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:321 src/cli/fs/gnunet-download.c:360
+#: src/service/nse/gnunet-nse-profiler.c:894
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-monitor.c:336
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:133
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:140
+#, fuzzy, c-format
+msgid "Could not connect to DHT service!\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/cli/dht/gnunet-dht-put.c:151
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:189
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:213
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/cli/dht/gnunet-dht-put.c:224
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:456 src/util/client.c:536
-#: src/util/service.c:1138
+#: src/cli/dht/gnunet-dht-put.c:242
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s：选项“%s”有歧义\n"
+msgid "Failed to load state: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/fs/gnunet-auto-share.c:287 src/cli/fs/gnunet-auto-share.c:296
+#: src/cli/fs/gnunet-auto-share.c:304
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:484 src/util/service.c:1158
+#: src/cli/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:480
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:491
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:711 src/cli/fs/gnunet-publish.c:897
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:718
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:505 src/util/service.c:1176
+#: src/cli/fs/gnunet-auto-share.c:724 src/cli/fs/gnunet-publish.c:902
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:731 src/cli/fs/gnunet-publish.c:947
+msgid "specify the priority of the content"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:738 src/cli/fs/gnunet-publish.c:960
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/cli/fs/gnunet-auto-share.c:761
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:54
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:106
+#, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-directory.c:109
+#, c-format
+msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:536 src/util/service.c:1207
+#: src/cli/fs/gnunet-directory.c:146
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/cli/fs/gnunet-directory.c:160
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/cli/fs/gnunet-directory.c:170
+#, fuzzy, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/cli/fs/gnunet-directory.c:201
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/cli/fs/gnunet-download.c:131
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/cli/fs/gnunet-download.c:143
+#, fuzzy
+msgid "<unknown time>"
+msgstr "未知错误"
+
+#: src/cli/fs/gnunet-download.c:155
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:177
+#, c-format
+msgid "Error downloading: %s.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:189
+#, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:207 src/cli/fs/gnunet-publish.c:300
+#: src/cli/fs/gnunet-search.c:546 src/cli/fs/gnunet-unindex.c:118
+#, c-format
+msgid "Unexpected status: %d\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:234
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/cli/fs/gnunet-download.c:240 src/cli/fs/gnunet-publish.c:716
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:272 src/cli/fs/gnunet-publish.c:870
+#: src/cli/fs/gnunet-unindex.c:155
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/fs/gnunet-download.c:319
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:325
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:331 src/cli/fs/gnunet-search.c:748
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:336
+msgid "write the file to FILENAME"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:343
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:350
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:355
+msgid "download a GNUnet directory recursively"
+msgstr ""
+
+#: src/cli/fs/gnunet-download.c:374
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+
+#: src/cli/fs/gnunet-fs.c:165
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/cli/fs/gnunet-fs.c:180
+msgid "Special file-sharing operations"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:220 src/cli/fs/gnunet-publish.c:235
+#, c-format
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:247
+#, c-format
+msgid "Error publishing: %s.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:255
+#, c-format
+msgid "Publishing `%s' done.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:259
+#, c-format
+msgid "URI is `%s'.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:265
+#, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:280
+msgid "Starting cleanup after abort\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:287
+msgid "Cleanup after abort completed.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:292
+msgid "Cleanup after abort failed.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:426
+#, fuzzy, c-format
+msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-service-arm.c:555 src/util/service.c:1226
+#: src/cli/fs/gnunet-publish.c:428
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/cli/fs/gnunet-publish.c:583
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/arm/gnunet-service-arm.c:951
+#: src/cli/fs/gnunet-publish.c:612
+msgid "Could not start publishing.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:645
 #, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
+msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:962
+#: src/cli/fs/gnunet-publish.c:647
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/cli/fs/gnunet-publish.c:653
 #, c-format
-msgid "Starting service `%s'\n"
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1062
+#: src/cli/fs/gnunet-publish.c:659
+msgid "Preprocessing complete.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:665
 #, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "无法创建用户账户："
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/cli/fs/gnunet-publish.c:671
+msgid "Meta data extraction has finished.\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1093
+#: src/cli/fs/gnunet-publish.c:679
+#, fuzzy
+msgid "Error scanning directory.\n"
+msgstr "未知错误。\n"
+
+#: src/cli/fs/gnunet-publish.c:706
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1124
+#: src/cli/fs/gnunet-publish.c:738
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/cli/fs/gnunet-publish.c:755
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:811
 #, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1272
+#: src/cli/fs/gnunet-publish.c:818
 #, c-format
-msgid "Preparing to stop `%s'\n"
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1604
+#: src/cli/fs/gnunet-publish.c:824
 #, c-format
-msgid "Restarting service `%s'.\n"
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1755
-msgid "exit"
+#: src/cli/fs/gnunet-publish.c:833 src/cli/vpn/gnunet-vpn.c:208
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1760
-msgid "signal"
+#: src/cli/fs/gnunet-publish.c:845 src/cli/fs/gnunet-publish.c:854
+#: src/service/transport/gnunet-transport.c:1230
+#: src/service/transport/gnunet-transport.c:1255
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:907
+msgid "enable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:913
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:921
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:928
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:933
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:940
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:953
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:965
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:972
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+
+#: src/cli/fs/gnunet-publish.c:980
+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/cli/fs/gnunet-publish.c:998
+msgid "Publish a file or directory on GNUnet"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:446
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:535
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "创建用户出错"
+
+#: src/cli/fs/gnunet-search.c:595
+#, c-format
+msgid "Conflicting options --bookmark-only and --silent.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:602
+#, c-format
+msgid "Conflicting options --bookmark-only and --output.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:608
+#, c-format
+msgid "An output file is mandatory for silent mode.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:629
+msgid "Could not create keyword URI from arguments.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:637
+msgid ""
+"Invalid URI. Valid URIs for searching are keyword query URIs\n"
+"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
+"\").\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:662
+#, fuzzy, c-format
+msgid "Could not initialize the `%s` subsystem.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/fs/gnunet-search.c:676
+msgid "Could not start searching.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:702
+msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:708
+msgid "do not search, print only the URI that points to this search"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:715
+msgid ""
+"write search results for directories according to FORMAT; accepted "
+"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
+"printf when omitted or to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:725
+msgid ""
+"write search results according to FORMAT; accepted placeholders are: %a, %f, "
+"%j, %l, %m, %n, %s; defaults to `"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:733
+msgid ""
+"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
+"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
+"%n, %p"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:742
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:754
+msgid ""
+"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
+"search --output=commons"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:761
+msgid "silent mode (requires the --output argument)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:767
+msgid ""
+"automatically terminate search after DELAY; the value given must be a number "
+"followed by a space and a time unit, for example \"500 ms\"; without a unit "
+"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
+"to wait for CTRL-C"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:776
+#, c-format
+msgid ""
+"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
+"arguments - ignored when these are provided by the user)"
+msgstr ""
+
+#: src/cli/fs/gnunet-search.c:789
+msgid "Search for files that have been published on GNUnet\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:94
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:103
+#, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:109
+msgid "Unindexing done.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:142
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1765
+#: src/cli/fs/gnunet-unindex.c:162
+msgid "Could not start unindex operation.\n"
+msgstr ""
+
+#: src/cli/fs/gnunet-unindex.c:195
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "“%s”不可用。\n"
+
+#: src/cli/gns/gnunet-gns.c:266 src/lib/util/dnsparser.c:254
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/cli/gns/gnunet-gns.c:280
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:291
+#: src/contrib/service/abd/gnunet-service-abd.c:1745
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/gns/gnunet-gns.c:304
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:339
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:345
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:351
+msgid "Specify a timeout for the lookup"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:355
+msgid "No unneeded output"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:360
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/cli/gns/gnunet-gns.c:374
 #, fuzzy
-msgid "unknown"
-msgstr "未知错误"
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet 错误日志"
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/cli/identity/gnunet-identity.c:225
 #, fuzzy, c-format
-msgid "Service `%s' took %s to terminate\n"
-msgstr "服务已删除。\n"
+msgid "Failed to create ego: %s\n"
+msgstr "发送消息失败。\n"
+
+#: src/cli/identity/gnunet-identity.c:540
+msgid "create ego NAME"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:545
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:551
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:557
+msgid ""
+"Read and decrypt message encrypted for the given ego (use together with -e "
+"EGO)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1798
+#: src/cli/identity/gnunet-identity.c:563
+msgid ""
+"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
+"with -k RECIPIENT_PUBLIC_KEY)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:568
+msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:572
+msgid "display all egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:576
+msgid "reduce output"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:583
+msgid ""
+"restrict results to NAME (use together with -d) or read and decrypt a "
+"message for NAME (use together with -R)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:589
+msgid "The public key of the recipient (with -W)"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:593
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/cli/identity/gnunet-identity.c:597
+#, fuzzy
+msgid "display private keys as well"
+msgstr "显示一个文件的散列值"
+
+#: src/cli/identity/gnunet-identity.c:612
+msgid "Maintain egos"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:105
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/namecache/gnunet-namecache.c:118
+#: src/cli/namestore/gnunet-namestore.c:889
 #, c-format
-msgid "Service `%s' terminated normally, will restart at any time\n"
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:174
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/cli/namecache/gnunet-namecache.c:181
+#, fuzzy, c-format
+msgid "Invalid public key for zone `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cli/namecache/gnunet-namecache.c:187
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "您必须指定一个接收方！\n"
+
+#: src/cli/namecache/gnunet-namecache.c:213
+#: src/cli/namestore/gnunet-namestore.c:2021
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1815
+#: src/cli/namecache/gnunet-namecache.c:220
+msgid "specifies the public key of the zone to look in"
+msgstr ""
+
+#: src/cli/namecache/gnunet-namecache.c:232
+#: src/cli/namestore/gnunet-namestore.c:2103
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
+
+#: src/cli/namestore/gnunet-namestore-dbtool.c:87
+#: src/cli/namestore/gnunet-namestore.c:1952
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:42
-msgid "Initiating shutdown as requested by client.\n"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:158
+msgid "initialize database"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
-msgid "description of the item to be sold"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:163
+msgid "reset database (DANGEROUS: All existing data is lost!"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
-msgid "mapping of possible prices"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:170
+msgid "the namestore plugin to work with, e.g. 'sqlite'"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:175
-msgid "max duration per round"
+#: src/cli/namestore/gnunet-namestore-dbtool.c:189
+#: src/cli/namestore/gnunet-namestore-zonefile.c:753
+#, fuzzy
+msgid "GNUnet namestore database manipulation tool"
+msgstr "GNUnet 配置"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:193
+#: src/cli/namestore/gnunet-namestore-zonefile.c:657
+#: src/cli/namestore/gnunet-namestore-zonefile.c:676
+#: src/contrib/service/abd/gnunet-abd.c:392
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:182
-msgid "duration until auction starts"
+#: src/cli/namestore/gnunet-namestore-zonefile.c:329
+#, fuzzy, c-format
+msgid "Failed to store records...\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:439
+#: src/cli/namestore/gnunet-namestore-zonefile.c:471
+#, fuzzy, c-format
+msgid "Name `%s' is too long\n"
+msgstr "服务已删除。\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:498
+#, fuzzy, c-format
+msgid "Failed to parse $TTL\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:509
+#, fuzzy, c-format
+msgid "Failed to parse $ORIGIN from %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:520
+#, c-format
+msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:529
+#, c-format
+msgid "Only %u records per unique name supported.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:187
+#: src/cli/namestore/gnunet-namestore-zonefile.c:591
+#, c-format
+msgid "Data `%s' invalid\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:705
+#, fuzzy, c-format
+msgid "Failed to connect to NAMESTORE\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:712
+#, fuzzy, c-format
+msgid "Failed to connect to IDENTITY\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/namestore/gnunet-namestore-zonefile.c:738
+#: src/cli/namestore/gnunet-namestore.c:2088
+msgid "name of the ego controlling the zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:411
+#, fuzzy, c-format
+msgid "Missing entries in record line `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/cli/namestore/gnunet-namestore.c:419
+#, fuzzy, c-format
+msgid "Unknown record type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/cli/namestore/gnunet-namestore.c:427
+#: src/cli/namestore/gnunet-namestore.c:442
+msgid "Empty record line argument is not allowed.\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:434
+#, fuzzy, c-format
+msgid "Error parsing expiration time %s.\n"
+msgstr "保存配置出错。"
+
+#: src/cli/namestore/gnunet-namestore.c:464
+#, fuzzy, c-format
+msgid "Invalid record data for type %s: `%s'.\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/cli/namestore/gnunet-namestore.c:668
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:686
+#: src/cli/namestore/gnunet-namestore.c:702
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "“%s”以错误码 %d 失败：%s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1138
+#, c-format
 msgid ""
-"number of items to sell\n"
-"0 for first price auction\n"
-">0 for vickrey/M+1st price auction"
+"A SOA record exists already under `%s', cannot add a second SOA to the same "
+"zone.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:194
-msgid "public auction outcome"
+#: src/cli/namestore/gnunet-namestore.c:1259
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:200
-msgid "keep running in foreground until auction completes"
+#: src/cli/namestore/gnunet-namestore.c:1302
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:212
-msgid "create a new auction and start listening for bidders"
+#: src/cli/namestore/gnunet-namestore.c:1327
+#, c-format
+msgid "%s\n"
 msgstr ""
 
-#: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
-#: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:570 src/template/gnunet-template.c:75
-msgid "help text"
+#: src/cli/namestore/gnunet-namestore.c:1356
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:606
+#: src/cli/namestore/gnunet-namestore.c:1370
+#, c-format
+msgid "Recordlines only work with option `%s'\n"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1379
+#: src/cli/namestore/gnunet-namestore.c:1431
+#: src/cli/namestore/gnunet-namestore.c:1441
+#: src/cli/namestore/gnunet-namestore.c:1451
+#: src/cli/namestore/gnunet-namestore.c:1480
+#: src/cli/namestore/gnunet-namestore.c:1501
+#: src/cli/namestore/gnunet-namestore.c:1528
+#: src/cli/namestore/gnunet-namestore.c:1538
+#: src/cli/namestore/gnunet-namestore.c:1571
+#: src/cli/namestore/gnunet-namestore.c:1596
+#: src/cli/namestore/gnunet-namestore.c:1630
+#: src/cli/namestore/gnunet-namestore.c:1664
+#: src/cli/namestore/gnunet-namestore.c:1687
 #, fuzzy, c-format
-msgid "Invalid peer ID `%s'\n"
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1381
+#, fuzzy
+msgid "name"
+msgstr "无名称"
+
+#: src/cli/namestore/gnunet-namestore.c:1410
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:685
+#: src/cli/namestore/gnunet-namestore.c:1433
+#: src/cli/namestore/gnunet-namestore.c:1443
+#: src/cli/namestore/gnunet-namestore.c:1453
+#: src/cli/namestore/gnunet-namestore.c:1482
+#: src/cli/namestore/gnunet-namestore.c:1503
+#: src/cli/namestore/gnunet-namestore.c:1689
+msgid "add"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1461
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1471
 #, c-format
-msgid "Extra arguments are not applicable in combination with this option.\n"
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1491
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:746
+#: src/cli/namestore/gnunet-namestore.c:1510
+#: src/cli/namestore/gnunet-namestore.c:1696
 #, fuzzy, c-format
-msgid "Invalid target `%s'\n"
+msgid "Invalid time format `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1530
+#: src/cli/namestore/gnunet-namestore.c:1540
+msgid "del"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1573
+msgid "purge-zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1598
+msgid "list"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1632
+msgid "reverse-pkey"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1642
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/cadet/gnunet-cadet.c:775
-msgid "No action requested\n"
+#: src/cli/namestore/gnunet-namestore.c:1666
+msgid "uri"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:800
-#, fuzzy
-msgid "Provide information about a particular connection"
-msgstr "无���获取有关用���“%s��的��息：%s\n"
+#: src/cli/namestore/gnunet-namestore.c:1679
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效���目。\n"
 
-#: src/cadet/gnunet-cadet.c:804
-msgid "Activate echo mode"
+#: src/cli/namestore/gnunet-namestore.c:1959
+#: src/contrib/service/abd/gnunet-abd.c:558
+#: src/contrib/service/abd/gnunet-service-abd.c:1750
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1089
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1967
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/cli/namestore/gnunet-namestore.c:1986
+msgid "add record"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:811
-msgid "Listen for connections using a shared secret among sender and recipient"
+#: src/cli/namestore/gnunet-namestore.c:1989
+msgid "delete record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1993
+msgid "display records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:1997
+msgid "read commands from stdin"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2004
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:817
+#: src/cli/namestore/gnunet-namestore.c:2010
 #, fuzzy
-msgid "Provide information about a patricular peer"
+msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cli/namestore/gnunet-namestore.c:2015
 #, fuzzy
-msgid "Provide information about all peers"
-msgstr "无法获���有关用���“%s”的信���：%s\n"
+msgid "monitor changes in the namestore"
+msgstr "��始化“%s”���务失败。\n"
 
-#: src/cadet/gnunet-cadet.c:827
+#: src/cli/namestore/gnunet-namestore.c:2025
 #, fuzzy
-msgid "Provide information about all tunnels"
+msgid "Output in recordline format"
+msgstr "以 gnuplot 格式输出"
+
+#: src/cli/namestore/gnunet-namestore.c:2031
+#, fuzzy
+msgid "determine our name for the given KEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/conversation/conversation_api.c:549
-#: src/conversation/conversation_api_call.c:521
+#: src/cli/namestore/gnunet-namestore.c:2037
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2042
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2048
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2052
+msgid "create or list public record"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2056
+msgid "omit private records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2061
+msgid "do not filter maintenance records"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2066
+msgid "purge namestore of all orphans"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2071
+msgid ""
+"show private key for orphaned records for recovery using `gnunet-identity -C "
+"-P <key>'. Use in combination with --display"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2076
+msgid "delete all records in specified zone"
+msgstr ""
+
+#: src/cli/namestore/gnunet-namestore.c:2082
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1835
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/cli/namestore/gnunet-zoneimport.c:1841
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:189
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr ""
+"\n"
+"您的配置更改没有保存。\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:208
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "保存配置失败。"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:215
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:327
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "配额配置"
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:335
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:338 src/cli/nat/gnunet-nat.c:446
+msgid "use TCP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:340 src/cli/nat/gnunet-nat.c:448
+msgid "use UDP"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:345
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/cli/nat-auto/gnunet-nat-auto.c:355
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "GNUnet 配置"
+
+#: src/cli/nat/gnunet-nat.c:422
+msgid "which IP and port are we locally using to bind/listen to"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:430
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:438
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:443
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:453
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/cli/nat/gnunet-nat.c:464
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:586
+msgid "Create a DID Document and display its DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:591
+msgid "Get the DID Document associated with the given DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:596
+msgid "Remove the DID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:600
+msgid "Replace the DID Document."
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:604
+msgid "Show the DID for a given ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:608
+msgid "Show egos with DIDs"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:614
+msgid "The Decentralized Identity (DID)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:620
+msgid "The DID Document to store in GNUNET"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:625
+msgid "The name of the EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-did.c:631
+msgid "The time until the DID Document is going to expire (e.g. 5d)"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:805
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/cli/reclaim/gnunet-reclaim.c:812
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:819
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/cli/reclaim/gnunet-reclaim.c:837
+msgid "Add or update an attribute NAME"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:842
+msgid "Delete the attribute with ID"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:847
+msgid "The attribute VALUE"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:852
+#, fuzzy
+msgid "The EGO to use"
+msgstr "消息尺寸"
+
+#: src/cli/reclaim/gnunet-reclaim.c:858
+msgid "Specify the relying party for issue"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:862
+msgid "List attributes for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:866
+msgid "List credentials for EGO"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:872
+msgid "Credential to use for attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
+msgid "Credential name"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:883
+msgid "Issue a ticket for a set of attributes separated by comma"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:888
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:893
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:898
+msgid "Type of attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:903
+msgid "Type of credential"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:907
+msgid "List tickets of ego"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:913
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:921
+msgid "re:claimID command line tool"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/cli/revocation/gnunet-revocation.c:146
+#, c-format
+msgid "Key `%s' is valid\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:150
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "服务已删除。\n"
+
+#: src/cli/revocation/gnunet-revocation.c:154
+#, fuzzy
+msgid "Internal error\n"
+msgstr "未知错误。\n"
+
+#: src/cli/revocation/gnunet-revocation.c:180
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:183
+msgid "Revocation failed (!)\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:189
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:192
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:198
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:252
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:302
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:334
+#, c-format
+msgid "Ego `%s' not found.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:350
+#, c-format
+msgid "Error: Key is invalid\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:357
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:367
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:379
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:386
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:424
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cli/revocation/gnunet-revocation.c:434
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:464
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/cli/revocation/gnunet-revocation.c:481
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/cli/revocation/gnunet-revocation.c:489
+#, fuzzy, c-format
+msgid "Revocation certificate corrupted in `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/cli/revocation/gnunet-revocation.c:511
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "没有指定接口，将使用默认。\n"
+
+#: src/cli/revocation/gnunet-revocation.c:530
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:538
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:545
+msgid "actually perform revocation, otherwise we just do the precomputation"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:552
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/cli/revocation/gnunet-revocation.c:558
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "迭代次数"
+
+#: src/cli/revocation/gnunet-revocation.c:570
+#: src/contrib/cli/template/gnunet-template.c:75
+#: src/contrib/service/auction/gnunet-auction-info.c:77
+#: src/contrib/service/auction/gnunet-auction-join.c:77
+#: src/contrib/service/conversation/gnunet-conversation-test.c:256
+msgid "help text"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:413
+#: src/cli/statistics/gnunet-statistics.c:455
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/statistics/gnunet-statistics.c:416
+#: src/cli/statistics/gnunet-statistics.c:458
+#, fuzzy, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/statistics/gnunet-statistics.c:532
+msgid "Missing argument: subsystem \n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:538
+msgid "Missing argument: name\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:577
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:589
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/statistics/gnunet-statistics.c:725
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cli/statistics/gnunet-statistics.c:742
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/cli/statistics/gnunet-statistics.c:751
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:783
+#, c-format
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:816
+msgid "limit output to statistics for the given NAME"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:821
+msgid "make the value being set persistent"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:827
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:832
+msgid "use as csv separator"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:838
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:843
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:847
+msgid "watch value continuously"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:852
+msgid "connect to remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:857
+msgid "port for remote host"
+msgstr ""
+
+#: src/cli/statistics/gnunet-statistics.c:874
+msgid "Print statistics about GNUnet operations."
+msgstr ""
+
+#: src/cli/util/gnunet-base32.c:47
+msgid "run decoder modus, otherwise runs as encoder"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:154
+msgid "test if the current installation supports the specified BACKEND"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:160
+msgid ""
+"Provide an appropriate value for CFLAGS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:165
+msgid "Is this an experimental build of GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:171
+msgid ""
+"Provide an appropriate value for LIBS to applications building on top of "
+"GNUnet"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:177
+msgid "Provide the path under which GNUnet was installed"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:192
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "更改配置文件中的一个值"
+
+#: src/cli/util/gnunet-crypto-tvg.c:1535
+msgid "verify a test vector from stdin"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:95
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/cli/util/gnunet-ecc.c:129
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:137
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:178
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/util/gnunet-ecc.c:185
+#, c-format
+msgid ""
+"\n"
+"Finished!\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:187
+#, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:304
+#, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:314
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
+#: src/service/testing/testing.c:308
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:334
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/cli/util/gnunet-ecc.c:388
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:452
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:458
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:464
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:469
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:474
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:479
+msgid "print the public key in HEX format"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:485
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/cli/util/gnunet-ecc.c:499
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "更改配置文件中的一个值"
+
+#: src/cli/util/gnunet-qr.c:130 src/cli/util/gnunet-qr.c:556
+#, fuzzy, c-format
+msgid "Failed to add URI %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/cli/util/gnunet-qr.c:134
+#, fuzzy, c-format
+msgid "Added URI %s\n"
+msgstr "无效条目。\n"
+
+#: src/cli/util/gnunet-qr.c:161
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `gnunet://'\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/cli/util/gnunet-qr.c:171
+#, c-format
+msgid "Invalid URI: fails to specify a subsystem\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:182
+#, c-format
+msgid "No known handler for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:218
+#, fuzzy, c-format
+msgid "Unable to start child process `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/cli/util/gnunet-qr.c:247
+#, fuzzy, c-format
+msgid "Failed to open device: `%s': %d\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/cli/util/gnunet-qr.c:261
+#, fuzzy
+msgid "Capturing...\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/cli/util/gnunet-qr.c:270 src/cli/util/gnunet-qr.c:485
+msgid "No captured images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:274 src/cli/util/gnunet-qr.c:489
+#, c-format
+msgid "Got %d images\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:321 src/cli/util/gnunet-qr.c:502
+#, c-format
+msgid "Found %s: \"%s\"\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:365 src/cli/util/gnunet-qr.c:367
+#, fuzzy, c-format
+msgid "%s is not a PNG file\n"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/cli/util/gnunet-qr.c:546
+msgid "No data found\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:562
+msgid "Dispatching the URI\n"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:573
+msgid "use the video device DEVICE (defaults to /dev/video0)"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:580
+msgid "read from the PNG-encoded file FILE"
+msgstr ""
+
+#: src/cli/util/gnunet-qr.c:591
+msgid "Scan a QR code and import the URI read"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:169
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/cli/util/gnunet-resolver.c:183
+msgid "Use built-in GNUnet stub resolver"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:215
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:243 src/service/nse/gnunet-service-nse.c:1441
+#: src/service/revocation/gnunet-service-revocation.c:922
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "值不在合法范围内。"
+
+#: src/cli/util/gnunet-scrypt.c:281
+msgid "number of bits to require for the proof of work"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:287
+msgid "file with private key, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:293
+msgid "file with proof of work, otherwise default is used"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:299
+msgid "time to wait between calculations"
+msgstr ""
+
+#: src/cli/util/gnunet-scrypt.c:313
+#, fuzzy
+msgid "Manipulate GNUnet proof of work files"
+msgstr "更改配置文件中的一个值"
+
+#: src/cli/util/gnunet-uri.c:89
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:95
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/cli/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:109
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/cli/util/gnunet-uri.c:179
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:142
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "创建用户出错"
+
+#: src/cli/vpn/gnunet-vpn.c:188 src/cli/vpn/gnunet-vpn.c:225
+#, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:202
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/cli/vpn/gnunet-vpn.c:216
+#, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:239
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/cli/vpn/gnunet-vpn.c:258
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/cli/vpn/gnunet-vpn.c:295
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:301
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:308
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:315
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:322
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:329
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:334
+msgid "service is offered via TCP"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:339
+msgid "service is offered via UDP"
+msgstr ""
+
+#: src/cli/vpn/gnunet-vpn.c:353
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:407
+#: src/contrib/service/abd/gnunet-abd.c:909
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:566
+msgid "Ego does not exist!\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:850
+#: src/contrib/service/abd/gnunet-abd.c:900
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:859
+#: src/contrib/service/abd/gnunet-abd.c:918
+#, fuzzy, c-format
+msgid "Failed to connect to ABD\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:865
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:872
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:882
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:890
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/contrib/service/abd/gnunet-abd.c:924
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:983
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1004
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1011
+msgid ""
+"The public key of the subject to lookup thecredential for, or for issuer "
+"side storage: subject and its attributes"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1018
+msgid "The private, signed delegate presented by the subject"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1025
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1030
+#, fuzzy
+msgid "The ego/zone name to use"
+msgstr "消息尺寸"
+
+#: src/contrib/service/abd/gnunet-abd.c:1036
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1042
+msgid ""
+"The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1047
+msgid "collect credentials"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1052
+msgid "Create and issue a credential issuer side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1057
+msgid "Issue a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1062
+msgid "Create, sign and return a credential subject side."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1069
+msgid "Import signed credentials that should be issued to a zone/ego"
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1073
+msgid "Create private record entry."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1079
+#: src/contrib/service/abd/gnunet-abd.c:1085
+msgid "Indicates that the collect/verify process is done via forward search."
+msgstr ""
+
+#: src/contrib/service/abd/gnunet-abd.c:1098
+#, fuzzy
+msgid "GNUnet abd resolver tool"
+msgstr "GNUnet 错误日志"
+
+#: src/contrib/service/abd/plugin_gnsrecord_abd.c:182
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/contrib/service/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:182
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:187
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:194
+msgid "public auction outcome"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:200
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/contrib/service/auction/gnunet-auction-create.c:212
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/contrib/service/conversation/conversation_api.c:549
+#: src/contrib/service/conversation/conversation_api_call.c:521
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
+#: src/contrib/service/conversation/gnunet-conversation-test.c:120
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:146
+#: src/contrib/service/conversation/gnunet-conversation-test.c:146
 #, c-format
 msgid ""
 "\n"
@@ -592,6903 +2481,5096 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:218
+#: src/contrib/service/conversation/gnunet-conversation-test.c:218
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/contrib/service/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:287
+#: src/contrib/service/conversation/gnunet-conversation.c:287
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/contrib/service/conversation/gnunet-conversation.c:319
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:325
+#: src/contrib/service/conversation/gnunet-conversation.c:325
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:343
+#: src/contrib/service/conversation/gnunet-conversation.c:343
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/contrib/service/conversation/gnunet-conversation.c:356
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/contrib/service/conversation/gnunet-conversation.c:368
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:391
+#: src/contrib/service/conversation/gnunet-conversation.c:391
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:398
+#: src/contrib/service/conversation/gnunet-conversation.c:398
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/contrib/service/conversation/gnunet-conversation.c:404
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/conversation/gnunet-conversation.c:411
+#: src/contrib/service/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:420
+#: src/contrib/service/conversation/gnunet-conversation.c:420
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:427
+#: src/contrib/service/conversation/gnunet-conversation.c:427
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/contrib/service/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:501
+#: src/contrib/service/conversation/gnunet-conversation.c:501
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:515
-#: src/conversation/gnunet-conversation.c:527
+#: src/contrib/service/conversation/gnunet-conversation.c:515
+#: src/contrib/service/conversation/gnunet-conversation.c:527
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:579
+#: src/contrib/service/conversation/gnunet-conversation.c:521
+#: src/contrib/service/conversation/gnunet-conversation.c:579
 #, c-format
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:596
+#: src/contrib/service/conversation/gnunet-conversation.c:538
+#: src/contrib/service/conversation/gnunet-conversation.c:596
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:548
+#: src/contrib/service/conversation/gnunet-conversation.c:548
 #, c-format
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:607
+#: src/contrib/service/conversation/gnunet-conversation.c:607
 #, c-format
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:622
+#: src/contrib/service/conversation/gnunet-conversation.c:622
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:649
+#: src/contrib/service/conversation/gnunet-conversation.c:649
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:673
+#: src/contrib/service/conversation/gnunet-conversation.c:673
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:680
+#: src/contrib/service/conversation/gnunet-conversation.c:680
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:687
-#: src/conversation/gnunet-conversation.c:717
+#: src/contrib/service/conversation/gnunet-conversation.c:687
+#: src/contrib/service/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:696
+#: src/contrib/service/conversation/gnunet-conversation.c:696
 #, c-format
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:705
+#: src/contrib/service/conversation/gnunet-conversation.c:705
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/contrib/service/conversation/gnunet-conversation.c:711
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:728
+#: src/contrib/service/conversation/gnunet-conversation.c:728
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:734
+#: src/contrib/service/conversation/gnunet-conversation.c:734
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:761
-#: src/conversation/gnunet-conversation.c:777
+#: src/contrib/service/conversation/gnunet-conversation.c:761
+#: src/contrib/service/conversation/gnunet-conversation.c:777
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:811
-#: src/conversation/gnunet-conversation.c:826
+#: src/contrib/service/conversation/gnunet-conversation.c:811
+#: src/contrib/service/conversation/gnunet-conversation.c:826
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:835
+#: src/contrib/service/conversation/gnunet-conversation.c:835
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:843
+#: src/contrib/service/conversation/gnunet-conversation.c:843
 #, c-format
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:858
+#: src/contrib/service/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:891
+#: src/contrib/service/conversation/gnunet-conversation.c:891
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:899
+#: src/contrib/service/conversation/gnunet-conversation.c:899
 #, c-format
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/contrib/service/conversation/gnunet-conversation.c:914
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/contrib/service/conversation/gnunet-conversation.c:941
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/contrib/service/conversation/gnunet-conversation.c:942
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/contrib/service/conversation/gnunet-conversation.c:945
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/contrib/service/conversation/gnunet-conversation.c:948
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/contrib/service/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:955
+#: src/contrib/service/conversation/gnunet-conversation.c:955
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/contrib/service/conversation/gnunet-conversation.c:958
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/contrib/service/conversation/gnunet-conversation.c:961
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/contrib/service/conversation/gnunet-conversation.c:964
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1124
+#: src/contrib/service/conversation/gnunet-conversation.c:1124
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1134
+#: src/contrib/service/conversation/gnunet-conversation.c:1134
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1166
+#: src/contrib/service/conversation/gnunet-conversation.c:1166
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1193
+#: src/contrib/service/conversation/gnunet-conversation.c:1193
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/contrib/service/conversation/gnunet-conversation.c:1199
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1218
+#: src/contrib/service/conversation/gnunet-conversation.c:1218
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
-#: src/conversation/gnunet_gst.c:665
+#: src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/contrib/service/conversation/gnunet_gst.c:665
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:330
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:330
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:649
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:649
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:676
-#: src/conversation/gnunet-helper-audio-record.c:568
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:676
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:568
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:681
-#: src/conversation/gnunet-helper-audio-record.c:573
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:681
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:573
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:697
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:697
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:711
-#: src/conversation/gnunet-helper-audio-record.c:601
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:711
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:601
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:732
-#: src/conversation/gnunet-helper-audio-record.c:624
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:732
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:624
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:738
-#: src/conversation/gnunet-helper-audio-record.c:630
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:738
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:630
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:752
-#: src/conversation/gnunet-helper-audio-record.c:645
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:752
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:645
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:759
-#: src/conversation/gnunet-helper-audio-record.c:651
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:759
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:651
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:765
-#: src/conversation/gnunet-helper-audio-record.c:657
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:765
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:657
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:845
+#: src/contrib/service/conversation/gnunet-helper-audio-playback.c:845
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:356
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:356
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:435
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:435
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:477
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:477
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:504
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:504
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:509
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:509
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:516
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:520
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:520
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:527
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:527
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:537
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:537
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:586
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:586
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:703
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:703
 #, fuzzy
 msgid "ogg_stream_init() failed.\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:748
+#: src/contrib/service/conversation/gnunet-helper-audio-record.c:748
 #, fuzzy, c-format
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-service-conversation.c:1366
+#: src/contrib/service/conversation/gnunet-service-conversation.c:1366
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/conversation/microphone.c:118
+#: src/contrib/service/conversation/microphone.c:118
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:72
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:72
 #, c-format
 msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:136
-#: src/conversation/plugin_gnsrecord_conversation.c:150
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:136
+#: src/contrib/service/conversation/plugin_gnsrecord_conversation.c:150
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/conversation/speaker.c:73
+#: src/contrib/service/conversation/speaker.c:73
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:91
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3136
+#: src/service/dht/gnunet_dht_profiler.c:958
 #, fuzzy
-msgid "fresh connection"
+msgid "number of peers to start"
+msgstr "迭代次数"
+
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3142
+msgid "duration of the profiling"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/core/gnunet-core.c:95
-msgid "key sent"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3148
+msgid "timeout for the profiling"
 msgstr ""
 
-#: src/core/gnunet-core.c:99
-msgid "key received"
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3153
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "迭代次数"
+
+#: src/contrib/service/rps/gnunet-rps-profiler.c:3170
+#, fuzzy
+msgid "Measure quality and performance of the RPS service."
+msgstr "无法访问该服务"
+
+#: src/contrib/service/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/contrib/service/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/core/gnunet-core.c:103
+#: src/contrib/service/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:228
 #, fuzzy
-msgid "connection established"
-msgstr "���不���������“%s”���一个 IP ��址。\n"
+msgid "You must specify at least one message ID to check!\n"
+msgstr "������须������一个昵��\n"
 
-#: src/core/gnunet-core.c:107
-msgid "rekeying"
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:236
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:249
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:267
+msgid "Need elements to compute the scalarproduct, got none.\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:290
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:308
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:338
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:364
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:371
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:378
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:385
+msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/core/gnunet-core.c:111
+#: src/contrib/service/scalarproduct/gnunet-scalarproduct.c:396
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
+#: src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
 #, fuzzy
-msgid "disconnected"
+msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:120
-msgid "Connection to CORE service lost (reconnecting)"
+#: src/contrib/service/scalarproduct/scalarproduct_api.c:184
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:124
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:624
 #, fuzzy
-msgid "unknown state"
-msgstr "未知错误"
+msgid "number of peers in consensus"
+msgstr "迭代次数"
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:630
+msgid "dkg start delay"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:636
+msgid "dkg timeout"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:642
+msgid "threshold"
+msgstr ""
+
+#: src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c:647
+msgid "also profile decryption"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-service-set.c:1915
+#: src/service/seti/gnunet-service-seti.c:2468
+#: src/service/setu/gnunet-service-setu.c:5412
+#, fuzzy
+msgid "Could not connect to CADET service\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/core/gnunet-core.c:129
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:268
+#: src/service/setu/gnunet-setu-ibf-profiler.c:268
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "迭代次数"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:274
+#: src/service/setu/gnunet-setu-ibf-profiler.c:274
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "迭代次数"
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:281
+#: src/service/setu/gnunet-setu-ibf-profiler.c:281
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:287
+#: src/service/setu/gnunet-setu-ibf-profiler.c:287
+msgid "hash num"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-ibf-profiler.c:293
+#: src/service/setu/gnunet-setu-ibf-profiler.c:293
+msgid "ibf size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:451
+#: src/contrib/service/set/gnunet-set-profiler.c:457
+#: src/contrib/service/set/gnunet-set-profiler.c:480
+#: src/service/seti/gnunet-seti-profiler.c:441
+#: src/service/seti/gnunet-seti-profiler.c:446
+#: src/service/seti/gnunet-seti-profiler.c:451
+#: src/service/setu/gnunet-setu-profiler.c:442
+#: src/service/setu/gnunet-setu-profiler.c:448
+#: src/service/setu/gnunet-setu-profiler.c:471
+#, fuzzy
+msgid "number of values"
+msgstr "迭代次数"
+
+#: src/contrib/service/set/gnunet-set-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:453
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:468
+#: src/service/setu/gnunet-setu-profiler.c:459
+msgid "force sending full set"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:474
+#: src/service/setu/gnunet-setu-profiler.c:465
+msgid "number delta operation"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:486
+#: src/service/setu/gnunet-setu-profiler.c:477
+msgid "operation to execute"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:492
+#: src/service/seti/gnunet-seti-profiler.c:462
+#: src/service/setu/gnunet-setu-profiler.c:483
+msgid "element size"
+msgstr ""
+
+#: src/contrib/service/set/gnunet-set-profiler.c:498
+#: src/service/seti/gnunet-seti-profiler.c:467
+#: src/service/setu/gnunet-setu-profiler.c:489
+msgid "write statistics to file"
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
+#: src/lib/util/gnunet_error_codes.c:59
+msgid "No error (success)."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
+#: src/lib/util/gnunet_error_codes.c:65
+#, fuzzy
+msgid "Unknown and unspecified error."
+msgstr "未知的用户“%s”\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
+#: src/lib/util/gnunet_error_codes.c:71
+#, fuzzy
+msgid "Communication with service failed."
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
+#: src/lib/util/gnunet_error_codes.c:77
+msgid "Ego not found."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
+#: src/lib/util/gnunet_error_codes.c:83
+msgid "Identifier already in use for another ego."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
+#: src/lib/util/gnunet_error_codes.c:89
+msgid "The given ego is invalid or malformed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
+#: src/lib/util/gnunet_error_codes.c:95
+#, fuzzy
+msgid "Unknown namestore error."
+msgstr "未知的用户“%s”\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
+msgid "Zone iteration failed."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
+#: src/lib/util/gnunet_error_codes.c:107
+msgid "Zone not found."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
+#: src/lib/util/gnunet_error_codes.c:113
+msgid "Record not found."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
+#: src/lib/util/gnunet_error_codes.c:125
+msgid "Zone does not contain any records."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
+#: src/lib/util/gnunet_error_codes.c:131
+#, fuzzy
+msgid "Failed to lookup record."
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
+#: src/lib/util/gnunet_error_codes.c:137
+#, fuzzy
+msgid "No records given."
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
+#: src/lib/util/gnunet_error_codes.c:143
+msgid "Record data invalid."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
+#: src/lib/util/gnunet_error_codes.c:149
+msgid "No label given."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
+#: src/lib/util/gnunet_error_codes.c:155
+#, fuzzy
+msgid "No results given."
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
+#: src/lib/util/gnunet_error_codes.c:161
+msgid "Record already exists."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
+#: src/lib/util/gnunet_error_codes.c:167
+msgid "Record size exceeds maximum limit."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
+#: src/lib/util/gnunet_error_codes.c:173
+msgid "There was an error in the database backend."
+msgstr ""
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
+#: src/lib/util/gnunet_error_codes.c:179
+#, fuzzy
+msgid "Failed to store the given records."
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
+#: src/lib/util/gnunet_error_codes.c:185
+msgid "Label invalid or malformed."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:51
+msgid "Label is NULL which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:56
+msgid "Label  contains `.' which is not allowed\n"
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:479
+msgid "Zone delegation record not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:487
+msgid "Zone delegation record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:497
+msgid "Multiple REDIRECT records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:506
+#: src/lib/gnsrecord/gnsrecord_misc.c:532
+msgid "Redirection record set contains mutually exclusive records."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:513
+msgid "Redirection records not allowed in apex."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:524
+msgid "Redirection records not allowed in apex.."
+msgstr ""
+
+#: src/lib/gnsrecord/gnsrecord_misc.c:546
+msgid "Mutually exclusive records."
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:303
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/lib/hello/gnunet-hello.c:310
 #, c-format
-msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:315
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:157
+#: src/lib/hello/gnunet-hello.c:324 src/lib/hello/gnunet-hello.c:375
 #, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
+msgid "Error opening file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/lib/hello/gnunet-hello.c:339
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:386
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
+msgstr "创建用户出错"
+
+#: src/lib/hello/gnunet-hello.c:395
+#, c-format
+msgid "Modified %u addresses, wrote %u bytes\n"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:409
+msgid "Hello file to read"
+msgstr ""
+
+#: src/lib/hello/gnunet-hello.c:418
+#, fuzzy
+msgid "Print information about peers."
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/lib/hello/hello.c:1089
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/lib/hello/hello.c:1099
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/lib/hello/hello.c:1109
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/lib/hello/hello.c:1121
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1139
+#, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1147
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/lib/hello/hello.c:1162
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/lib/json/json.c:130
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/sq/sq.c:47
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:54
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/lib/sq/sq.c:126
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/bio.c:231 src/lib/util/bio.c:239
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "创建用户出错"
+
+#: src/lib/util/bio.c:241
+msgid "End of file"
+msgstr ""
+
+#: src/lib/util/bio.c:270
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/lib/util/bio.c:272
+msgid "Not enough data left"
+msgstr ""
+
+#: src/lib/util/bio.c:312
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:163
+#: src/lib/util/bio.c:339 src/lib/util/bio.c:796
+msgid "string length"
+msgstr ""
+
+#: src/lib/util/bio.c:345
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/lib/util/bio.c:350
+#, c-format
+msgid "Error reading length of string `%s'"
+msgstr ""
+
+#: src/lib/util/bio.c:363
+#, c-format
+msgid "String `%s' longer than allowed (%u > %lu)"
+msgstr ""
+
+#: src/lib/util/bio.c:687 src/lib/util/bio.c:708
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/lib/util/bio.c:689
+msgid "No associated file"
+msgstr ""
+
+#: src/lib/util/bio.c:773
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/service/arm/gnunet-service-arm.c:452
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/service/arm/gnunet-service-arm.c:456
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/lib/util/client.c:751 src/lib/util/client.c:942
+msgid "not a valid filename"
+msgstr ""
+
+#: src/lib/util/client.c:1097
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:647 src/lib/util/common_logging.c:686
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/lib/util/common_logging.c:910
+#, fuzzy, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
+
+#: src/lib/util/common_logging.c:1103
+msgid "ERROR"
+msgstr "错误"
+
+#: src/lib/util/common_logging.c:1105
+msgid "WARNING"
+msgstr "警告"
+
+#: src/lib/util/common_logging.c:1107
+msgid "MESSAGE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1109
+msgid "INFO"
+msgstr "信息"
+
+#: src/lib/util/common_logging.c:1111
+msgid "DEBUG"
+msgstr "调试"
+
+#: src/lib/util/common_logging.c:1113
+msgid "NONE"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1114
+msgid "INVALID"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1359
+msgid "unknown address"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1404
+msgid "invalid address"
+msgstr ""
+
+#: src/lib/util/common_logging.c:1416
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#: src/lib/util/common_logging.c:1431
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#: src/lib/util/configuration.c:1073
+#, fuzzy, c-format
+msgid "Failed to parse configuration file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/configuration.c:1718
 #, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "初始��“%s”服��������。\n"
+msgid "Not a valid relative time specification"
+msgstr "配置���件“%s”��������。\n"
 
-#: src/core/gnunet-core.c:186 src/transport/gnunet-transport.c:1389
-msgid "provide information about all current connections (continuously)"
+#: src/lib/util/configuration.c:1788
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:196
-msgid "Print information about connected peers."
+#: src/lib/util/configuration_helper.c:134
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:148
+#, fuzzy, c-format
+msgid "%s, %s or %s argument is required\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/lib/util/configuration_helper.c:219
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/lib/util/configuration_helper.c:263
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/container_bloomfilter.c:532
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/lib/util/crypto_ecc.c:79 src/lib/util/crypto_ecc_setup.c:48
+#: src/lib/util/crypto_mpi.c:41
+#: src/plugin/namecache/plugin_namecache_sqlite.c:53
+#: src/plugin/namestore/plugin_namestore_sqlite.c:55
+#: src/service/datacache/plugin_datacache_sqlite.c:128
+#: src/service/datacache/plugin_datacache_sqlite.c:150
+#: src/service/datastore/plugin_datastore_sqlite.c:63
+#: src/service/datastore/plugin_datastore_sqlite.c:81
+#: src/service/peerstore/plugin_peerstore_sqlite.c:54
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/lib/util/crypto_ecc.c:554
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/lib/util/crypto_ecc.c:677
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/lib/util/crypto_ecc_setup.c:282
+#, fuzzy
+msgid "Could not load peer's private key\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/lib/util/crypto_random.c:372
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+
+#: src/lib/util/crypto_rsa.c:908
+#, fuzzy, c-format
+msgid "RSA signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/lib/util/crypto_rsa.c:1208
+#, fuzzy, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/lib/util/disk.c:843
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "“%s”应为目录！\n"
+
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/lib/util/dnsparser.c:910
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/lib/util/dnsstub.c:228
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/lib/util/dnsstub.c:371
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)\n"
+msgstr ""
+
+#: src/lib/util/dnsstub.c:504
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/lib/util/dnsstub.c:509
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/lib/util/getopt.c:566
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/lib/util/getopt.c:591
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s：选项“--%s”不允许有参数\n"
+
+#: src/lib/util/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s：选项“%c%s”不允许有参数\n"
+
+#: src/lib/util/getopt.c:617 src/lib/util/getopt.c:798
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s：选项“%s”要求有一个参数\n"
+
+#: src/lib/util/getopt.c:648
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s：无法识别的选项“--%s”\n"
+
+#: src/lib/util/getopt.c:654
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s：无法识别的选项“%c%s”\n"
+
+#: src/lib/util/getopt.c:681
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s：非法选项 -- %c\n"
+
+#: src/lib/util/getopt.c:683
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s：无效选项 -- %c\n"
+
+#: src/lib/util/getopt.c:712 src/lib/util/getopt.c:848
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s：选项要求有一个参数 -- %c\n"
+
+#: src/lib/util/getopt.c:762
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s：选项“-W %s”有歧义\n"
+
+#: src/lib/util/getopt.c:782
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s：选项“-W %s” 不允许有参数\n"
+
+#: src/lib/util/getopt.c:971
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "请使用 --help 获取选项列表。\n"
+
+#: src/lib/util/getopt.c:984
+#, c-format
+msgid "Option `%s' can't be used with other options.\n"
+msgstr ""
+
+#: src/lib/util/getopt.c:996
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/lib/util/getopt_helpers.c:64
+msgid "print the version number"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:111
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "长选项的必选参数对短选项也是必选的。\n"
+
+#: src/lib/util/getopt_helpers.c:198
+msgid "print this help"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:263
+msgid "be verbose"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:379
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:446
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:463
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "更改配置文件中的一个值"
+
+#: src/lib/util/getopt_helpers.c:499 src/lib/util/getopt_helpers.c:813
+#: src/lib/util/getopt_helpers.c:869
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/lib/util/getopt_helpers.c:571
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/lib/util/getopt_helpers.c:578
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:596
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:598
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:632
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/lib/util/getopt_helpers.c:686
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/lib/util/getopt_helpers.c:743
+#, fuzzy, c-format
+msgid "You must pass a timestamp to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/lib/util/getopt_helpers.c:750
+#, c-format
+msgid "The maximum precision allowed for timestamps is seconds.\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:806
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number\n"
+msgstr ""
+
+#: src/lib/util/getopt_helpers.c:876
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/lib/util/getopt_helpers.c:954
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/lib/util/helper.c:304
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/lib/util/helper.c:356
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/lib/util/helper.c:571
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/lib/util/network.c:163
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/lib/util/network.c:1284
+#, c-format
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+
+#: src/lib/util/os_installation.c:416
+#, fuzzy, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr "无法确定安装路径。请尝试设置“%s”\n"
+
+#: src/lib/util/os_installation.c:787
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/lib/util/os_installation.c:820
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:87
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "插件机构初始化失败：%s！\n"
+
+#: src/lib/util/plugin.c:158
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:215
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr ""
+
+#: src/lib/util/plugin.c:371
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/program.c:314
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s'. Exiting ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/program.c:329
+#, fuzzy
+msgid "Malformed configuration. Exiting ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/regex.c:123
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:243
+#, c-format
+msgid ""
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:888
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:901
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/lib/util/resolver_api.c:1086
+msgid "Resolver not configured correctly.\n"
+msgstr ""
+
+#: src/lib/util/resolver_api.c:1175 src/lib/util/resolver_api.c:1198
+#: src/lib/util/resolver_api.c:1212
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/lib/util/service.c:654
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:838
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+
+#: src/lib/util/service.c:951
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:992
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/service/arm/gnunet-service-arm.c:412
+#: src/service/arm/gnunet-service-arm.c:418
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/lib/util/service.c:1401
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/lib/util/service.c:1413
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr ""
+
+#: src/lib/util/service.c:1420
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/lib/util/service.c:1481
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/lib/util/service.c:1505
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/lib/util/service.c:1573
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
+msgstr ""
+
+#: src/lib/util/service.c:1644
+msgid "No such user"
+msgstr "无此用户"
+
+#: src/lib/util/service.c:1658
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s”：%s\n"
+
+#: src/lib/util/service.c:1751
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/lib/util/service.c:1756
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/lib/util/service.c:1761
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
+#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
+#: src/service/transport/transport-testing-communicator.c:1055
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/socks.c:636
+#, c-format
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
+msgstr ""
+
+#: src/lib/util/socks.c:653
+#, c-format
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
+msgstr ""
+
+#: src/lib/util/strings.c:394
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:513
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
+
+#: src/lib/util/strings.c:1049
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1057
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1064
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1072
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1081
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/lib/util/strings.c:1263 src/lib/util/strings.c:1274
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/lib/util/strings.c:1283
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/lib/util/strings.c:1354 src/lib/util/strings.c:1383
+#: src/lib/util/strings.c:1430 src/lib/util/strings.c:1450
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/lib/util/strings.c:1408
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+
+#: src/lib/util/strings.c:1459
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/lib/util/strings.c:1501
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/lib/util/strings.c:1551
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
+
+#: src/lib/util/strings.c:1582
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
+
+#: src/lib/util/time.c:901 src/lib/util/time.c:929
+#, c-format
+msgid "Failed to map `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/lib/util/time.c:937
+#, c-format
+msgid ""
+"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:137
+msgid "This is a memento of an older block for internal maintenance."
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:176
+#, fuzzy, c-format
+msgid "Unable to parse zone key record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:190
+msgid "Record type does not match parsed record type\n"
+msgstr ""
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:213
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:230
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:254
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gns/plugin_gnsrecord_gns.c:286
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:366
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:384
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:405
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:479
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:515
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:532
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:552
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:572
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:584
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:607
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:620
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:639
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:659
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:673
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/gnsrecord/plugin_gnsrecord_dns.c:692
+#, fuzzy, c-format
+msgid "Unable to parse CAA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:117
+#: src/plugin/namecache/plugin_namecache_flat.c:252
+#: src/plugin/namestore/plugin_namestore_flat.c:175
+#: src/plugin/namestore/plugin_namestore_flat.c:423
+#: src/service/peerstore/plugin_peerstore_flat.c:380
+#: src/service/peerstore/plugin_peerstore_flat.c:542
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:128
+#: src/plugin/namestore/plugin_namestore_flat.c:186
+#: src/service/peerstore/plugin_peerstore_flat.c:395
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr "发送消息失败。\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:147
+#: src/service/peerstore/plugin_peerstore_flat.c:407
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "发送消息失败。\n"
+
+#: src/plugin/namecache/plugin_namecache_flat.c:403
+#, fuzzy
+msgid "flat plugin running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:179
+#: src/plugin/namestore/plugin_namestore_sqlite.c:893
+#: src/service/datastore/plugin_datastore_sqlite.c:311
+#: src/service/peerstore/plugin_peerstore_sqlite.c:540
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:189
+#: src/plugin/namecache/plugin_namecache_sqlite.c:203
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:236
+#: src/plugin/namestore/plugin_namestore_sqlite.c:227
+#: src/service/datacache/plugin_datacache_sqlite.c:1035
+#: src/service/datastore/plugin_datastore_sqlite.c:532
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
+
+#: src/plugin/namecache/plugin_namecache_sqlite.c:563
+#: src/service/datastore/plugin_datastore_sqlite.c:1338
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/plugin/namestore/plugin_namestore_flat.c:194
+#, c-format
+msgid "File too big to map: %llu bytes.\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:218
+#, c-format
+msgid "Namestore database file `%s' malformed\n"
+msgstr ""
+
+#: src/plugin/namestore/plugin_namestore_flat.c:791
+#, fuzzy
+msgid "Flat file database running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:180
+#: src/plugin/namestore/plugin_namestore_sqlite.c:190
+#, fuzzy, c-format
+msgid "Failed to setup database with: `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/plugin/namestore/plugin_namestore_sqlite.c:955
+#, fuzzy
+msgid "SQlite database running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/plugin/namestore/plugin_rest_namestore.c:1320
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/gns/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/identity/plugin_rest_identity.c:1245
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/reclaim/plugin_rest_openid_connect.c:3095
+msgid "OpenID Connect REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/reclaim/plugin_rest_pabc.c:637
+#: src/rest-plugin/reclaim/plugin_rest_reclaim.c:1520
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/rest/plugin_rest_config.c:428
+msgid "CONFIG REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugin/rest/plugin_rest_copying.c:211
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:391
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:951
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/service/arm/gnunet-service-arm.c:962
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1062
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "无法创建用户账户："
+
+#: src/service/arm/gnunet-service-arm.c:1093
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1124
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1272
+#, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1604
+#, c-format
+msgid "Restarting service `%s'.\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1755
+msgid "exit"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1760
+msgid "signal"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1765
+#, fuzzy
+msgid "unknown"
+msgstr "未知错误"
+
+#: src/service/arm/gnunet-service-arm.c:1771
+#, fuzzy, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "服务已删除。\n"
+
+#: src/service/arm/gnunet-service-arm.c:1798
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr ""
+
+#: src/service/arm/gnunet-service-arm.c:1815
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/service/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:329
+#: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:355
+#: src/service/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:419
+#: src/service/core/gnunet-service-core.c:419
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:505
+#: src/service/core/gnunet-service-core.c:505
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:824
+#: src/service/core/gnunet-service-core.c:824
 #, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:926
+#: src/service/core/gnunet-service-core.c:926
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/core/gnunet-service-core.c:954
+#: src/service/core/gnunet-service-core.c:954
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
 
-#: src/core/gnunet-service-core_kx.c:511
+#: src/service/core/gnunet-service-core_kx.c:511
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:569
+#: src/service/core/gnunet-service-core_kx.c:569
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:666
+#: src/service/core/gnunet-service-core_kx.c:666
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:718
+#: src/service/core/gnunet-service-core_kx.c:718
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:774
+#: src/service/core/gnunet-service-core_kx.c:774
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:806
+#: src/service/core/gnunet-service-core_kx.c:806
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "消息尺寸"
 
-#: src/core/gnunet-service-core_kx.c:865
+#: src/service/core/gnunet-service-core_kx.c:865
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:880
+#: src/service/core/gnunet-service-core_kx.c:880
 msgid "# duplicate ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/service/core/gnunet-service-core_kx.c:917
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:936
+#: src/service/core/gnunet-service-core_kx.c:936
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/service/core/gnunet-service-core_kx.c:943
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:962
+#: src/service/core/gnunet-service-core_kx.c:962
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/service/core/gnunet-service-core_kx.c:1072
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1082
+#: src/service/core/gnunet-service-core_kx.c:1082
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1134
+#: src/service/core/gnunet-service-core_kx.c:1134
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/service/core/gnunet-service-core_kx.c:1159
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1172
+#: src/service/core/gnunet-service-core_kx.c:1172
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1229
+#: src/service/core/gnunet-service-core_kx.c:1229
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1237
+#: src/service/core/gnunet-service-core_kx.c:1237
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1246
+#: src/service/core/gnunet-service-core_kx.c:1246
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1288
+#: src/service/core/gnunet-service-core_kx.c:1288
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1331
+#: src/service/core/gnunet-service-core_kx.c:1331
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1343
+#: src/service/core/gnunet-service-core_kx.c:1343
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1352
+#: src/service/core/gnunet-service-core_kx.c:1352
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/service/core/gnunet-service-core_kx.c:1521
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1533
+#: src/service/core/gnunet-service-core_kx.c:1533
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/service/core/gnunet-service-core_kx.c:1537
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1618
-#: src/core/gnunet-service-core_kx.c:1647
+#: src/service/core/gnunet-service-core_kx.c:1618
+#: src/service/core/gnunet-service-core_kx.c:1647
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/service/core/gnunet-service-core_kx.c:1632
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1679
+#: src/service/core/gnunet-service-core_kx.c:1679
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1689
+#: src/service/core/gnunet-service-core_kx.c:1689
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:252
-#: src/core/gnunet-service-core_sessions.c:337
-#: src/fs/gnunet-service-fs_cp.c:475 src/fs/gnunet-service-fs_cp.c:1368
-#: src/topology/gnunet-daemon-topology.c:522
-#: src/topology/gnunet-daemon-topology.c:604
+#: src/service/core/gnunet-service-core_sessions.c:252
+#: src/service/core/gnunet-service-core_sessions.c:337
+#: src/service/fs/gnunet-service-fs_cp.c:475
+#: src/service/fs/gnunet-service-fs_cp.c:1368
+#: src/service/topology/gnunet-daemon-topology.c:522
+#: src/service/topology/gnunet-daemon-topology.c:604
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:285
+#: src/service/core/gnunet-service-core_sessions.c:285
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:400
+#: src/service/core/gnunet-service-core_sessions.c:400
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_sessions.c:418
+#: src/service/core/gnunet-service-core_sessions.c:418
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:183
+#: src/service/core/gnunet-service-core_typemap.c:169
+#: src/service/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:217
+#: src/service/core/gnunet-service-core_typemap.c:217
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:492
+#: src/service/datacache/plugin_datacache_heap.c:492
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datacache/plugin_datacache_sqlite.c:128
-#: src/datacache/plugin_datacache_sqlite.c:150
-#: src/datastore/plugin_datastore_sqlite.c:63
-#: src/datastore/plugin_datastore_sqlite.c:81
-#: src/namecache/plugin_namecache_sqlite.c:54
-#: src/namestore/plugin_namestore_sqlite.c:56
-#: src/peerstore/plugin_peerstore_sqlite.c:54 src/util/crypto_ecc.c:79
-#: src/util/crypto_ecc_setup.c:48 src/util/crypto_mpi.c:41
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
-#: src/datacache/plugin_datacache_sqlite.c:1035
-#: src/datastore/plugin_datastore_sqlite.c:532
-#: src/namecache/plugin_namecache_sqlite.c:237
-#: src/namestore/plugin_namestore_sqlite.c:228
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:340
+#: src/service/datastore/datastore_api.c:340
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:462
+#: src/service/datastore/datastore_api.c:462
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:565
+#: src/service/datastore/datastore_api.c:565
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:595
+#: src/service/datastore/datastore_api.c:595
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:756
+#: src/service/datastore/datastore_api.c:756
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:810
+#: src/service/datastore/datastore_api.c:810
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:917
+#: src/service/datastore/datastore_api.c:917
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1007
+#: src/service/datastore/datastore_api.c:1007
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1068
+#: src/service/datastore/datastore_api.c:1068
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1113
+#: src/service/datastore/datastore_api.c:1113
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1171
+#: src/service/datastore/datastore_api.c:1171
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1230
+#: src/service/datastore/datastore_api.c:1230
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1276
+#: src/service/datastore/datastore_api.c:1276
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1357
+#: src/service/datastore/datastore_api.c:1357
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:187
-#, c-format
-msgid "Dumped %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:214 src/datastore/gnunet-datastore.c:226
-#, c-format
-msgid "Short write to file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:257
-#, fuzzy, c-format
-msgid "Error queueing datastore GET operation\n"
-msgstr "创建用户出错"
-
-#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:400
-#, fuzzy, c-format
-msgid "Unable to open dump file: %s\n"
-msgstr "发送消息失败。\n"
-
-#: src/datastore/gnunet-datastore.c:319
-#, fuzzy, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/datastore/gnunet-datastore.c:331
-#, c-format
-msgid "Inserted %<PRIu64> records\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:339 src/datastore/gnunet-datastore.c:353
-#, c-format
-msgid "Short read from file: %zd bytes expecting %zd\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:378
-#, fuzzy, c-format
-msgid "Error queueing datastore PUT operation\n"
-msgstr "创建用户出错"
-
-#: src/datastore/gnunet-datastore.c:417
-#, c-format
-msgid "Input file is not of a supported format\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:442
-#, fuzzy, c-format
-msgid "Failed connecting to the datastore.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/datastore/gnunet-datastore.c:454
-#, c-format
-msgid "Please choose at least one operation: %s, %s\n"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:477
-#, fuzzy
-msgid "Dump all records from the datastore"
-msgstr "发送消息失败。\n"
-
-#: src/datastore/gnunet-datastore.c:482
-msgid "Insert records into the datastore"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:487
-msgid "File to dump or insert"
-msgstr ""
-
-#: src/datastore/gnunet-datastore.c:498
-#, fuzzy
-msgid "Manipulate GNUnet datastore"
-msgstr "更改配置文件中的一个值"
-
-#: src/datastore/gnunet-service-datastore.c:335
+#: src/service/datastore/gnunet-service-datastore.c:335
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:419
+#: src/service/datastore/gnunet-service-datastore.c:419
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:551
+#: src/service/datastore/gnunet-service-datastore.c:551
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:593
+#: src/service/datastore/gnunet-service-datastore.c:593
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:606
+#: src/service/datastore/gnunet-service-datastore.c:606
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:612
+#: src/service/datastore/gnunet-service-datastore.c:612
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:619
+#: src/service/datastore/gnunet-service-datastore.c:619
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
-#: src/datastore/gnunet-service-datastore.c:677
-#: src/datastore/gnunet-service-datastore.c:820
-#: src/datastore/gnunet-service-datastore.c:1428
+#: src/service/datastore/gnunet-service-datastore.c:626
+#: src/service/datastore/gnunet-service-datastore.c:677
+#: src/service/datastore/gnunet-service-datastore.c:820
+#: src/service/datastore/gnunet-service-datastore.c:1428
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:693
+#: src/service/datastore/gnunet-service-datastore.c:693
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:743
+#: src/service/datastore/gnunet-service-datastore.c:743
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:758
+#: src/service/datastore/gnunet-service-datastore.c:758
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:858
+#: src/service/datastore/gnunet-service-datastore.c:858
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/service/datastore/gnunet-service-datastore.c:888
 msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:899
+#: src/service/datastore/gnunet-service-datastore.c:899
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:940
+#: src/service/datastore/gnunet-service-datastore.c:940
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:971
+#: src/service/datastore/gnunet-service-datastore.c:971
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1012
+#: src/service/datastore/gnunet-service-datastore.c:1012
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1019
+#: src/service/datastore/gnunet-service-datastore.c:1019
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1058
+#: src/service/datastore/gnunet-service-datastore.c:1058
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1107
+#: src/service/datastore/gnunet-service-datastore.c:1107
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1112
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/service/datastore/gnunet-service-datastore.c:1112
+#: src/service/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1167
+#: src/service/datastore/gnunet-service-datastore.c:1167
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1176
+#: src/service/datastore/gnunet-service-datastore.c:1176
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1236
+#: src/service/datastore/gnunet-service-datastore.c:1236
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1288
+#: src/service/datastore/gnunet-service-datastore.c:1288
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1298
+#: src/service/datastore/gnunet-service-datastore.c:1298
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1463
+#: src/service/datastore/gnunet-service-datastore.c:1463
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1472
+#: src/service/datastore/gnunet-service-datastore.c:1472
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/service/datastore/gnunet-service-datastore.c:1475
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/service/datastore/gnunet-service-datastore.c:1491
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1512
-#: src/datastore/gnunet-service-datastore.c:1534
+#: src/service/datastore/gnunet-service-datastore.c:1512
+#: src/service/datastore/gnunet-service-datastore.c:1534
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1573
+#: src/service/datastore/gnunet-service-datastore.c:1573
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/plugin_datastore_heap.c:895
+#: src/service/datastore/plugin_datastore_heap.c:895
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_postgres.c:238
-#: src/datastore/plugin_datastore_postgres.c:850
+#: src/service/datastore/plugin_datastore_postgres.c:238
+#: src/service/datastore/plugin_datastore_postgres.c:850
 msgid "Postgresql exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:811
+#: src/service/datastore/plugin_datastore_postgres.c:811
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:87
+#: src/service/datastore/plugin_datastore_sqlite.c:87
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:311
-#: src/namecache/plugin_namecache_sqlite.c:180
-#: src/namestore/plugin_namestore_sqlite.c:894
-#: src/peerstore/plugin_peerstore_sqlite.c:540
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:634
+#: src/service/datastore/plugin_datastore_sqlite.c:634
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:675
+#: src/service/datastore/plugin_datastore_sqlite.c:675
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
 
-#: src/datastore/plugin_datastore_sqlite.c:1252
+#: src/service/datastore/plugin_datastore_sqlite.c:1252
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1267
-#: src/datastore/plugin_datastore_sqlite.c:1280
+#: src/service/datastore/plugin_datastore_sqlite.c:1267
+#: src/service/datastore/plugin_datastore_sqlite.c:1280
 #, fuzzy
 msgid "error preparing statement\n"
 msgstr "创建用户出错"
 
-#: src/datastore/plugin_datastore_sqlite.c:1288
+#: src/service/datastore/plugin_datastore_sqlite.c:1288
 #, fuzzy
 msgid "error stepping\n"
 msgstr "创建用户出错"
 
-#: src/datastore/plugin_datastore_sqlite.c:1296
+#: src/service/datastore/plugin_datastore_sqlite.c:1296
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1338
-#: src/namecache/plugin_namecache_sqlite.c:564
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/datastore/plugin_datastore_template.c:252
+#: src/service/datastore/plugin_datastore_template.c:252
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:166
-#, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:167
-#, c-format
-msgid "Result %d, type %d:\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:238
-msgid "Must provide key for DHT GET!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-hello.c:119
-#: src/dht/gnunet-dht-monitor.c:255
-#, fuzzy, c-format
-msgid "Failed to connect to DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-dht-get.c:256
-msgid "Issuing DHT GET with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:293 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:201
-msgid "the query key"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:299
-msgid "how many parallel requests (replicas) to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:304 src/dht/gnunet-dht-put.c:218
-msgid "use DHT's record route option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:310 src/dht/gnunet-dht-monitor.c:308
-msgid "the type of data to look for"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:316
-msgid "how long to execute this query before giving up?"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:322 src/dht/gnunet-dht-put.c:207
-msgid "use DHT's demultiplex everywhere option"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:339
-msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr ""
-
-#: src/dht/gnunet-dht-hello.c:166
-msgid "Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:315
-msgid "how long should the monitor command run"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:321 src/fs/gnunet-download.c:360
-#: src/nse/gnunet-nse-profiler.c:894
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-monitor.c:336
-msgid "Prints all packets that go through the DHT."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:133
-msgid "Must provide KEY and DATA for DHT put!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:140
-#, fuzzy, c-format
-msgid "Could not connect to DHT service!\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/dht/gnunet-dht-put.c:151
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:189
-msgid "the data to insert under the key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:213
-msgid "how many replicas to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:224
-msgid "the type to insert data as"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:242
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:925
+#: src/service/dht/gnunet_dht_profiler.c:925
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/dht/gnunet_dht_profiler.c:958 src/rps/gnunet-rps-profiler.c:3136
-#, fuzzy
-msgid "number of peers to start"
-msgstr "迭代次数"
-
-#: src/dht/gnunet_dht_profiler.c:964
+#: src/service/dht/gnunet_dht_profiler.c:964
 msgid "number of PUTs to perform per peer"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:970 src/nse/gnunet-nse-profiler.c:872
+#: src/service/dht/gnunet_dht_profiler.c:970
+#: src/service/nse/gnunet-nse-profiler.c:872
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:976
+#: src/service/dht/gnunet_dht_profiler.c:976
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:982
+#: src/service/dht/gnunet_dht_profiler.c:982
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:988
+#: src/service/dht/gnunet_dht_profiler.c:988
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:993
+#: src/service/dht/gnunet_dht_profiler.c:993
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:999
+#: src/service/dht/gnunet_dht_profiler.c:999
 msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1005
+#: src/service/dht/gnunet_dht_profiler.c:1005
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1026
+#: src/service/dht/gnunet_dht_profiler.c:1026
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
 
-#: src/dns/gnunet-dns-monitor.c:370 src/dns/gnunet-dns-monitor.c:375
+#: src/service/dns/gnunet-dns-monitor.c:370
+#: src/service/dns/gnunet-dns-monitor.c:375
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:387
+#: src/service/dns/gnunet-dns-monitor.c:387
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:240
+#: src/service/dns/gnunet-dns-redirector.c:240
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:246
+#: src/service/dns/gnunet-dns-redirector.c:246
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:259
+#: src/service/dns/gnunet-dns-redirector.c:259
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:463
+#: src/service/dns/gnunet-service-dns.c:463
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:617
+#: src/service/dns/gnunet-service-dns.c:617
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:753
+#: src/service/dns/gnunet-service-dns.c:753
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:829
+#: src/service/dns/gnunet-service-dns.c:829
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:951
+#: src/service/dns/gnunet-service-dns.c:951
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:970
+#: src/service/dns/gnunet-service-dns.c:970
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:981
+#: src/service/dns/gnunet-service-dns.c:981
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:993
+#: src/service/dns/gnunet-service-dns.c:993
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:996
+#: src/service/dns/gnunet-service-dns.c:996
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1066
+#: src/service/dns/gnunet-service-dns.c:1066
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1114 src/exit/gnunet-daemon-exit.c:3704
+#: src/service/dns/gnunet-service-dns.c:1114
+#: src/service/exit/gnunet-daemon-exit.c:3704
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dns/gnunet-service-dns.c:1125
+#: src/service/dns/gnunet-service-dns.c:1125
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/service/exit/gnunet-daemon-exit.c:968
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1074
+#: src/service/exit/gnunet-daemon-exit.c:1074
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1368
+#: src/service/exit/gnunet-daemon-exit.c:1368
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1500 src/exit/gnunet-daemon-exit.c:1612
-#: src/exit/gnunet-daemon-exit.c:1662 src/exit/gnunet-daemon-exit.c:1745
-#: src/exit/gnunet-daemon-exit.c:1872 src/exit/gnunet-daemon-exit.c:2013
-#: src/exit/gnunet-daemon-exit.c:2283
+#: src/service/exit/gnunet-daemon-exit.c:1500
+#: src/service/exit/gnunet-daemon-exit.c:1612
+#: src/service/exit/gnunet-daemon-exit.c:1662
+#: src/service/exit/gnunet-daemon-exit.c:1745
+#: src/service/exit/gnunet-daemon-exit.c:1872
+#: src/service/exit/gnunet-daemon-exit.c:2013
+#: src/service/exit/gnunet-daemon-exit.c:2283
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1504
+#: src/service/exit/gnunet-daemon-exit.c:1504
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/service/exit/gnunet-daemon-exit.c:1616
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1658
+#: src/service/exit/gnunet-daemon-exit.c:1658
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1749
+#: src/service/exit/gnunet-daemon-exit.c:1749
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1837
+#: src/service/exit/gnunet-daemon-exit.c:1837
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1876
+#: src/service/exit/gnunet-daemon-exit.c:1876
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2017
+#: src/service/exit/gnunet-daemon-exit.c:2017
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2088 src/exit/gnunet-daemon-exit.c:2363
-#: src/exit/gnunet-daemon-exit.c:2733 src/vpn/gnunet-service-vpn.c:816
-#: src/vpn/gnunet-service-vpn.c:1003 src/vpn/gnunet-service-vpn.c:2133
+#: src/service/exit/gnunet-daemon-exit.c:2088
+#: src/service/exit/gnunet-daemon-exit.c:2363
+#: src/service/exit/gnunet-daemon-exit.c:2733
+#: src/service/vpn/gnunet-service-vpn.c:816
+#: src/service/vpn/gnunet-service-vpn.c:1003
+#: src/service/vpn/gnunet-service-vpn.c:2133
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2153 src/exit/gnunet-daemon-exit.c:2430
-#: src/exit/gnunet-daemon-exit.c:2774 src/vpn/gnunet-service-vpn.c:889
-#: src/vpn/gnunet-service-vpn.c:1042 src/vpn/gnunet-service-vpn.c:2199
+#: src/service/exit/gnunet-daemon-exit.c:2153
+#: src/service/exit/gnunet-daemon-exit.c:2430
+#: src/service/exit/gnunet-daemon-exit.c:2774
+#: src/service/vpn/gnunet-service-vpn.c:889
+#: src/service/vpn/gnunet-service-vpn.c:1042
+#: src/service/vpn/gnunet-service-vpn.c:2199
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2287
+#: src/service/exit/gnunet-daemon-exit.c:2287
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2346 src/vpn/gnunet-service-vpn.c:994
-#: src/vpn/gnunet-service-vpn.c:2121
+#: src/service/exit/gnunet-daemon-exit.c:2346
+#: src/service/vpn/gnunet-service-vpn.c:994
+#: src/service/vpn/gnunet-service-vpn.c:2121
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2413 src/vpn/gnunet-service-vpn.c:872
-#: src/vpn/gnunet-service-vpn.c:2163 src/vpn/gnunet-service-vpn.c:2177
+#: src/service/exit/gnunet-daemon-exit.c:2413
+#: src/service/vpn/gnunet-service-vpn.c:872
+#: src/service/vpn/gnunet-service-vpn.c:2163
+#: src/service/vpn/gnunet-service-vpn.c:2177
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2495 src/exit/gnunet-daemon-exit.c:3196
+#: src/service/exit/gnunet-daemon-exit.c:2495
+#: src/service/exit/gnunet-daemon-exit.c:3196
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/service/exit/gnunet-daemon-exit.c:2616
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2636
+#: src/service/exit/gnunet-daemon-exit.c:2636
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2828
+#: src/service/exit/gnunet-daemon-exit.c:2828
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2837
+#: src/service/exit/gnunet-daemon-exit.c:2837
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2913
+#: src/service/exit/gnunet-daemon-exit.c:2913
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2987
+#: src/service/exit/gnunet-daemon-exit.c:2987
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3036
+#: src/service/exit/gnunet-daemon-exit.c:3036
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3051
+#: src/service/exit/gnunet-daemon-exit.c:3051
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3078
+#: src/service/exit/gnunet-daemon-exit.c:3078
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3109
+#: src/service/exit/gnunet-daemon-exit.c:3109
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3161
+#: src/service/exit/gnunet-daemon-exit.c:3161
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3170
+#: src/service/exit/gnunet-daemon-exit.c:3170
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3373 src/exit/gnunet-daemon-exit.c:3384
+#: src/service/exit/gnunet-daemon-exit.c:3373
+#: src/service/exit/gnunet-daemon-exit.c:3384
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3398 src/exit/gnunet-daemon-exit.c:3406
+#: src/service/exit/gnunet-daemon-exit.c:3398
+#: src/service/exit/gnunet-daemon-exit.c:3406
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3448
+#: src/service/exit/gnunet-daemon-exit.c:3448
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3463 src/exit/gnunet-daemon-exit.c:3478
+#: src/service/exit/gnunet-daemon-exit.c:3463
+#: src/service/exit/gnunet-daemon-exit.c:3478
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3492
+#: src/service/exit/gnunet-daemon-exit.c:3492
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3637
+#: src/service/exit/gnunet-daemon-exit.c:3637
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3646
+#: src/service/exit/gnunet-daemon-exit.c:3646
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3654
+#: src/service/exit/gnunet-daemon-exit.c:3654
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3661
+#: src/service/exit/gnunet-daemon-exit.c:3661
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3832
+#: src/service/exit/gnunet-daemon-exit.c:3832
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3948
+#: src/service/exit/gnunet-daemon-exit.c:3948
 #, c-format
 msgid "`%s' is not SUID or the path is invalid, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3960 src/pt/gnunet-daemon-pt.c:1210
+#: src/service/exit/gnunet-daemon-exit.c:3960
+#: src/service/pt/gnunet-daemon-pt.c:1210
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4114
+#: src/service/exit/gnunet-daemon-exit.c:4114
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fs/fs_api.c:481
+#: src/service/fs/fs_api.c:481
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:492
+#: src/service/fs/fs_api.c:492
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_api.c:500
+#: src/service/fs/fs_api.c:500
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1157
+#: src/service/fs/fs_api.c:1157
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1708
+#: src/service/fs/fs_api.c:1708
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1723
+#: src/service/fs/fs_api.c:1723
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2452
+#: src/service/fs/fs_api.c:2452
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2463
+#: src/service/fs/fs_api.c:2463
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2611 src/fs/fs_api.c:2857
+#: src/service/fs/fs_api.c:2611 src/service/fs/fs_api.c:2857
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2629
+#: src/service/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2645 src/fs/fs_api.c:2665 src/fs/fs_api.c:3164
+#: src/service/fs/fs_api.c:2645 src/service/fs/fs_api.c:2665
+#: src/service/fs/fs_api.c:3164
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2847
+#: src/service/fs/fs_api.c:2847
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:3108
+#: src/service/fs/fs_api.c:3108
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:216
+#: src/service/fs/fs_directory.c:216
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:311
+#: src/service/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:333
+#: src/service/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:347
+#: src/service/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directory contents of `%s' for recursive download\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:529 src/fs/fs_download.c:542
+#: src/service/fs/fs_download.c:529 src/service/fs/fs_download.c:542
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:961
+#: src/service/fs/fs_download.c:961
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1045
+#: src/service/fs/fs_download.c:1045
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %lu bytes at depth %u and "
 "offset %llu/%llu, got %lu bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1067
+#: src/service/fs/fs_download.c:1067
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1090
+#: src/service/fs/fs_download.c:1090
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1101
+#: src/service/fs/fs_download.c:1101
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1111
+#: src/service/fs/fs_download.c:1111
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1219
+#: src/service/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1890
+#: src/service/fs/fs_download.c:1890
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 
-#: src/fs/fs_getopt.c:237
+#: src/service/fs/fs_getopt.c:237
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:191
+#: src/service/fs/fs_list_indexed.c:191
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_misc.c:129
+#: src/service/fs/fs_misc.c:129
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:203
+#: src/service/fs/fs_namespace.c:203
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_namespace.c:234
+#: src/service/fs/fs_namespace.c:234
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:331
+#: src/service/fs/fs_namespace.c:331
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:458
+#: src/service/fs/fs_namespace.c:458
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:439
+#: src/service/fs/fs_publish.c:129 src/service/fs/fs_publish.c:439
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:732
+#: src/service/fs/fs_publish.c:732
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_publish.c:789 src/fs/fs_publish.c:835 src/fs/fs_publish.c:856
-#: src/fs/fs_publish.c:887 src/fs/fs_publish.c:1155
+#: src/service/fs/fs_publish.c:789 src/service/fs/fs_publish.c:835
+#: src/service/fs/fs_publish.c:856 src/service/fs/fs_publish.c:887
+#: src/service/fs/fs_publish.c:1155
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:791
+#: src/service/fs/fs_publish.c:791
 #, fuzzy
 msgid "error on index-start request to `fs' service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:837
+#: src/service/fs/fs_publish.c:837
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:857
+#: src/service/fs/fs_publish.c:857
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:889
+#: src/service/fs/fs_publish.c:889
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/service/fs/fs_publish.c:915
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:1004 src/fs/fs_publish.c:1041
+#: src/service/fs/fs_publish.c:1004 src/service/fs/fs_publish.c:1041
 msgid "Can not create LOC URI. Will continue with CHK instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1108
+#: src/service/fs/fs_publish.c:1108
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1116
+#: src/service/fs/fs_publish.c:1116
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1157
+#: src/service/fs/fs_publish.c:1157
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1397
+#: src/service/fs/fs_publish.c:1397
 #, fuzzy, c-format
 msgid "Datastore failure: %s"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/fs/fs_publish.c:1489
+#: src/service/fs/fs_publish.c:1489
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:213
+#: src/service/fs/fs_publish_ksk.c:213
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:215
+#: src/service/fs/fs_publish_ublock.c:215
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:830 src/fs/fs_search.c:901
+#: src/service/fs/fs_search.c:830 src/service/fs/fs_search.c:901
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_search.c:994
+#: src/service/fs/fs_search.c:994
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/service/fs/fs_unindex.c:64
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:69
+#: src/service/fs/fs_unindex.c:69
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:276
+#: src/service/fs/fs_unindex.c:276
 #, fuzzy
 msgid "Error communicating with `fs' service."
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/fs/fs_unindex.c:327
+#: src/service/fs/fs_unindex.c:327
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:377 src/fs/fs_unindex.c:390
+#: src/service/fs/fs_unindex.c:377 src/service/fs/fs_unindex.c:390
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_unindex.c:386
+#: src/service/fs/fs_unindex.c:386
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:447
+#: src/service/fs/fs_unindex.c:447
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:593 src/fs/fs_unindex.c:657
+#: src/service/fs/fs_unindex.c:593 src/service/fs/fs_unindex.c:657
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:670
+#: src/service/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:709
+#: src/service/fs/fs_unindex.c:709
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:232
+#: src/service/fs/fs_uri.c:232
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:291
+#: src/service/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:309
+#: src/service/fs/fs_uri.c:309
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:316
+#: src/service/fs/fs_uri.c:316
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:383
+#: src/service/fs/fs_uri.c:383
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:424
+#: src/service/fs/fs_uri.c:424
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:441
+#: src/service/fs/fs_uri.c:441
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:518
+#: src/service/fs/fs_uri.c:518
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:535
+#: src/service/fs/fs_uri.c:535
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/service/fs/fs_uri.c:545
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/service/fs/fs_uri.c:553
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:562
+#: src/service/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:568
+#: src/service/fs/fs_uri.c:568
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:575
+#: src/service/fs/fs_uri.c:575
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/service/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:593
+#: src/service/fs/fs_uri.c:593
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:599
+#: src/service/fs/fs_uri.c:599
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:613
+#: src/service/fs/fs_uri.c:613
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:646
+#: src/service/fs/fs_uri.c:646
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:666
+#: src/service/fs/fs_uri.c:666
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1061 src/fs/fs_uri.c:1088
+#: src/service/fs/fs_uri.c:1061 src/service/fs/fs_uri.c:1088
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1094
+#: src/service/fs/fs_uri.c:1094
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:234
-#, fuzzy, c-format
-msgid "Failed to load state: %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-auto-share.c:287 src/fs/gnunet-auto-share.c:296
-#: src/fs/gnunet-auto-share.c:304
-#, fuzzy, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/gnunet-auto-share.c:401
-#, c-format
-msgid "Publication of `%s' done\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:480
-#, c-format
-msgid "Publishing `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:491
-#, fuzzy, c-format
-msgid "Failed to run `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-auto-share.c:661
-#, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:897
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:718
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:902
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:947
-msgid "specify the priority of the content"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:960
-msgid "set the desired replication LEVEL"
-msgstr ""
-
-#: src/fs/gnunet-auto-share.c:761
-msgid "Automatically publish files from a directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-daemon-fsprofiler.c:668
+#: src/service/fs/gnunet-daemon-fsprofiler.c:668
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:54
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:106
-#, c-format
-msgid "Directory `%s' meta data:\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:109
-#, c-format
-msgid "Directory `%s' contents:\n"
-msgstr ""
-
-#: src/fs/gnunet-directory.c:146
-#, fuzzy
-msgid "You must specify a filename to inspect.\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/fs/gnunet-directory.c:160
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/gnunet-directory.c:170
-#, fuzzy, c-format
-msgid "`%s' is not a GNUnet directory\n"
-msgstr "更改 GNUnet 目录的权限出错"
-
-#: src/fs/gnunet-directory.c:201
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "更改 GNUnet 目录的权限出错"
-
-#: src/fs/gnunet-download.c:131
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/fs/gnunet-download.c:143
-#, fuzzy
-msgid "<unknown time>"
-msgstr "未知错误"
-
-#: src/fs/gnunet-download.c:155
-#, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:177
-#, c-format
-msgid "Error downloading: %s.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:189
-#, c-format
-msgid "Downloading `%s' done (%s/s).\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:207 src/fs/gnunet-publish.c:300
-#: src/fs/gnunet-search.c:546 src/fs/gnunet-unindex.c:118
-#, c-format
-msgid "Unexpected status: %d\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:234
-#, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:716
-#, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
-msgstr ""
-
-#: src/fs/gnunet-download.c:272 src/fs/gnunet-publish.c:870
-#: src/fs/gnunet-unindex.c:155
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/gnunet-download.c:319
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr ""
-
-#: src/fs/gnunet-download.c:325
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:331 src/fs/gnunet-search.c:748
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
-
-#: src/fs/gnunet-download.c:336
-msgid "write the file to FILENAME"
-msgstr ""
-
-#: src/fs/gnunet-download.c:343
-msgid "set the maximum number of parallel downloads that is allowed"
-msgstr ""
-
-#: src/fs/gnunet-download.c:350
-msgid "set the maximum number of parallel requests for blocks that is allowed"
-msgstr ""
-
-#: src/fs/gnunet-download.c:355
-msgid "download a GNUnet directory recursively"
-msgstr ""
-
-#: src/fs/gnunet-download.c:374
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/service/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:218
+#: src/service/fs/gnunet-fs-profiler.c:218
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:225
+#: src/service/fs/gnunet-fs-profiler.c:225
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:237
+#: src/service/fs/gnunet-fs-profiler.c:237
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:165
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:180
-msgid "Special file-sharing operations"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:220 src/fs/gnunet-publish.c:235
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:247
-#, c-format
-msgid "Error publishing: %s.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:255
-#, c-format
-msgid "Publishing `%s' done.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:259
-#, c-format
-msgid "URI is `%s'.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:265
-#, c-format
-msgid "Namespace URI is `%s'.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:280
-msgid "Starting cleanup after abort\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:287
-msgid "Cleanup after abort completed.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:292
-msgid "Cleanup after abort failed.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:426
-#, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/gnunet-publish.c:428
-#, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/fs/gnunet-publish.c:583
-#, fuzzy
-msgid "Could not publish\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/fs/gnunet-publish.c:612
-msgid "Could not start publishing.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
-msgid "Scanning directory `%s'.\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/gnunet-publish.c:647
-#, fuzzy, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/fs/gnunet-publish.c:653
-#, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:659
-msgid "Preprocessing complete.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:665
-#, fuzzy, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/gnunet-publish.c:671
-msgid "Meta data extraction has finished.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:679
-#, fuzzy
-msgid "Error scanning directory.\n"
-msgstr "未知错误。\n"
-
-#: src/fs/gnunet-publish.c:706
-#, c-format
-msgid "Selected pseudonym `%s' unknown\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:738
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/gnunet-publish.c:755
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:811
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:818
-#, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:824
-#, c-format
-msgid "You must NOT specify an URI and a filename.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:208
-#, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:845 src/fs/gnunet-publish.c:854
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1255
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:907
-msgid "enable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:913
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:921
-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:928
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:933
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:940
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:953
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:965
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:972
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:980
-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:998
-msgid "Publish a file or directory on GNUnet"
-msgstr ""
-
-#: src/fs/gnunet-search.c:446
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:535
-#, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "创建用户出错"
-
-#: src/fs/gnunet-search.c:595
-#, c-format
-msgid "Conflicting options --bookmark-only and --silent.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:602
-#, c-format
-msgid "Conflicting options --bookmark-only and --output.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:608
-#, c-format
-msgid "An output file is mandatory for silent mode.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:629
-msgid "Could not create keyword URI from arguments.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:637
-msgid ""
-"Invalid URI. Valid URIs for searching are keyword query URIs\n"
-"(\"gnunet://fs/ksk/...\") and namespace content URIs (\"gnunet://fs/sks/..."
-"\").\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:662
-#, fuzzy, c-format
-msgid "Could not initialize the `%s` subsystem.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/gnunet-search.c:676
-msgid "Could not start searching.\n"
-msgstr ""
-
-#: src/fs/gnunet-search.c:702
-msgid "set the desired LEVEL of receiver-anonymity (default: 1)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:708
-msgid "do not search, print only the URI that points to this search"
-msgstr ""
-
-#: src/fs/gnunet-search.c:715
-msgid ""
-"write search results for directories according to FORMAT; accepted "
-"placeholders are: %a, %f, %j, %l, %m, %n, %s; defaults to the value of --"
-"printf when omitted or to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:725
-msgid ""
-"write search results according to FORMAT; accepted placeholders are: %a, %f, "
-"%j, %l, %m, %n, %s; defaults to `"
-msgstr ""
-
-#: src/fs/gnunet-search.c:733
-msgid ""
-"when the %a or %j placeholders appear in --printf or --dir-printf, list each "
-"metadata property according to FORMAT; accepted placeholders are: %i, %l, "
-"%n, %p"
-msgstr ""
-
-#: src/fs/gnunet-search.c:742
-msgid "automatically terminate search after VALUE results are found"
-msgstr ""
-
-#: src/fs/gnunet-search.c:754
-msgid ""
-"create a GNUnet directory with search results at FILENAME (e.g. `gnunet-"
-"search --output=commons"
-msgstr ""
-
-#: src/fs/gnunet-search.c:761
-msgid "silent mode (requires the --output argument)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:767
-msgid ""
-"automatically terminate search after DELAY; the value given must be a number "
-"followed by a space and a time unit, for example \"500 ms\"; without a unit "
-"it defaults to microseconds - 1000000 = 1 second; if 0 or omitted it means "
-"to wait for CTRL-C"
-msgstr ""
-
-#: src/fs/gnunet-search.c:776
-#, c-format
-msgid ""
-"be verbose (append \"%a\\n\" to the default --printf and --dir-printf "
-"arguments - ignored when these are provided by the user)"
-msgstr ""
-
-#: src/fs/gnunet-search.c:789
-msgid "Search for files that have been published on GNUnet\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs.c:364 src/fs/gnunet-service-fs.c:832
+#: src/service/fs/gnunet-service-fs.c:364
+#: src/service/fs/gnunet-service-fs.c:832
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:423
+#: src/service/fs/gnunet-service-fs.c:423
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:602 src/fs/gnunet-service-fs_cp.c:436
+#: src/service/fs/gnunet-service-fs.c:602
+#: src/service/fs/gnunet-service-fs_cp.c:436
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:785
+#: src/service/fs/gnunet-service-fs.c:785
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:825
+#: src/service/fs/gnunet-service-fs.c:825
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:995
+#: src/service/fs/gnunet-service-fs.c:995
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1237
+#: src/service/fs/gnunet-service-fs.c:1237
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/gnunet-service-fs.c:1271 src/hostlist/gnunet-daemon-hostlist.c:343
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/service/fs/gnunet-service-fs.c:1271
+#: src/service/hostlist/gnunet-daemon-hostlist.c:343
+#: src/service/topology/gnunet-daemon-topology.c:976
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:353
+#: src/service/fs/gnunet-service-fs_cadet_client.c:353
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:369
+#: src/service/fs/gnunet-service-fs_cadet_client.c:369
 msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/service/fs/gnunet-service-fs_cadet_server.c:263
 msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:318
+#: src/service/fs/gnunet-service-fs_cadet_server.c:318
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:344
+#: src/service/fs/gnunet-service-fs_cadet_server.c:344
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:387
+#: src/service/fs/gnunet-service-fs_cadet_server.c:387
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:394
-#: src/fs/gnunet-service-fs_cadet_server.c:433
+#: src/service/fs/gnunet-service-fs_cadet_server.c:394
+#: src/service/fs/gnunet-service-fs_cadet_server.c:433
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:539
+#: src/service/fs/gnunet-service-fs_cp.c:539
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:543
+#: src/service/fs/gnunet-service-fs_cp.c:543
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:576 src/fs/gnunet-service-fs_cp.c:1201
+#: src/service/fs/gnunet-service-fs_cp.c:576
+#: src/service/fs/gnunet-service-fs_cp.c:1201
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:671
+#: src/service/fs/gnunet-service-fs_cp.c:671
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:868
+#: src/service/fs/gnunet-service-fs_cp.c:868
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/service/fs/gnunet-service-fs_cp.c:893
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:903
+#: src/service/fs/gnunet-service-fs_cp.c:903
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1000
+#: src/service/fs/gnunet-service-fs_cp.c:1000
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1058
+#: src/service/fs/gnunet-service-fs_cp.c:1058
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1082
+#: src/service/fs/gnunet-service-fs_cp.c:1082
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1096
+#: src/service/fs/gnunet-service-fs_cp.c:1096
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1153
+#: src/service/fs/gnunet-service-fs_cp.c:1153
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1197
+#: src/service/fs/gnunet-service-fs_cp.c:1197
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1541
+#: src/service/fs/gnunet-service-fs_cp.c:1541
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:129
-#: src/fs/gnunet-service-fs_indexing.c:187
+#: src/service/fs/gnunet-service-fs_indexing.c:129
+#: src/service/fs/gnunet-service-fs_indexing.c:187
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:146
+#: src/service/fs/gnunet-service-fs_indexing.c:146
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:243
+#: src/service/fs/gnunet-service-fs_indexing.c:243
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:296
+#: src/service/fs/gnunet-service-fs_indexing.c:296
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:310
+#: src/service/fs/gnunet-service-fs_indexing.c:310
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/service/fs/gnunet-service-fs_indexing.c:314
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/service/fs/gnunet-service-fs_indexing.c:328
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:434
+#: src/service/fs/gnunet-service-fs_indexing.c:434
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:260
+#: src/service/fs/gnunet-service-fs_pe.c:260
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:422
+#: src/service/fs/gnunet-service-fs_pe.c:422
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
+#: src/service/fs/gnunet-service-fs_pe.c:433
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:462
+#: src/service/fs/gnunet-service-fs_pe.c:462
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:530
+#: src/service/fs/gnunet-service-fs_pe.c:530
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:540
+#: src/service/fs/gnunet-service-fs_pe.c:540
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:600 src/fs/gnunet-service-fs_pe.c:703
-#: src/fs/gnunet-service-fs_pe.c:786
+#: src/service/fs/gnunet-service-fs_pe.c:600
+#: src/service/fs/gnunet-service-fs_pe.c:703
+#: src/service/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:305
+#: src/service/fs/gnunet-service-fs_pr.c:305
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:396 src/fs/gnunet-service-fs_pr.c:626
+#: src/service/fs/gnunet-service-fs_pr.c:396
+#: src/service/fs/gnunet-service-fs_pr.c:626
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:795
+#: src/service/fs/gnunet-service-fs_pr.c:795
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:869
+#: src/service/fs/gnunet-service-fs_pr.c:869
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1003
+#: src/service/fs/gnunet-service-fs_pr.c:1003
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1032
+#: src/service/fs/gnunet-service-fs_pr.c:1032
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1073
+#: src/service/fs/gnunet-service-fs_pr.c:1073
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/service/fs/gnunet-service-fs_pr.c:1228
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1283
+#: src/service/fs/gnunet-service-fs_pr.c:1283
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1304
+#: src/service/fs/gnunet-service-fs_pr.c:1304
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/service/fs/gnunet-service-fs_pr.c:1371
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1433
+#: src/service/fs/gnunet-service-fs_pr.c:1433
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1488
+#: src/service/fs/gnunet-service-fs_pr.c:1488
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1503
+#: src/service/fs/gnunet-service-fs_pr.c:1503
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1526
+#: src/service/fs/gnunet-service-fs_pr.c:1526
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/service/fs/gnunet-service-fs_pr.c:1543
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1564
+#: src/service/fs/gnunet-service-fs_pr.c:1564
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1570
+#: src/service/fs/gnunet-service-fs_pr.c:1570
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1616
+#: src/service/fs/gnunet-service-fs_pr.c:1616
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629
+#: src/service/fs/gnunet-service-fs_pr.c:1629
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/service/fs/gnunet-service-fs_pr.c:1680
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1744
+#: src/service/fs/gnunet-service-fs_pr.c:1744
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:643
+#: src/service/fs/gnunet-service-fs_push.c:643
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:94
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:103
-#, c-format
-msgid "Error unindexing: %s.\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:109
-msgid "Unindexing done.\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:142
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:162
-msgid "Could not start unindex operation.\n"
-msgstr ""
-
-#: src/fs/gnunet-unindex.c:195
-msgid "Unindex a file that was previously indexed with gnunet-publish."
-msgstr ""
-
-#: src/fs/meta_data.c:1061 src/fs/meta_data.c:1117 src/fs/meta_data.c:1136
+#: src/service/fs/meta_data.c:1061 src/service/fs/meta_data.c:1117
+#: src/service/fs/meta_data.c:1136
 msgid "metadata length"
 msgstr ""
 
-#: src/fs/meta_data.c:1073
+#: src/service/fs/meta_data.c:1073
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u > %u)\n"
 msgstr ""
 
-#: src/fs/meta_data.c:1092
+#: src/service/fs/meta_data.c:1092
 #, fuzzy, c-format
 msgid "Failed to deserialize metadata `%s'"
 msgstr "发送消息失败。\n"
 
-#: src/fs/meta_data.c:1124
+#: src/service/fs/meta_data.c:1124
 #, c-format
 msgid "Serialized %ld bytes of metadata"
 msgstr ""
 
-#: src/fs/meta_data.c:1131
+#: src/service/fs/meta_data.c:1131
 #, fuzzy, c-format
 msgid "Failed to serialize metadata `%s'"
 msgstr "发送消息失败。\n"
 
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:59
-#: src/util/gnunet_error_codes.c:59
-msgid "No error (success)."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:65
-#: src/util/gnunet_error_codes.c:65
-#, fuzzy
-msgid "Unknown and unspecified error."
-msgstr "未知的用户“%s”\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:71
-#: src/util/gnunet_error_codes.c:71
-#, fuzzy
-msgid "Communication with service failed."
-msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:77
-#: src/util/gnunet_error_codes.c:77
-msgid "Ego not found."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:83
-#: src/util/gnunet_error_codes.c:83
-msgid "Identifier already in use for another ego."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:89
-#: src/util/gnunet_error_codes.c:89
-msgid "The given ego is invalid or malformed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:95
-#: src/util/gnunet_error_codes.c:95
-#, fuzzy
-msgid "Unknown namestore error."
-msgstr "未知的用户“%s”\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:101
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:119
-#: src/util/gnunet_error_codes.c:101 src/util/gnunet_error_codes.c:119
-msgid "Zone iteration failed."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:107
-#: src/util/gnunet_error_codes.c:107
-msgid "Zone not found."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:113
-#: src/util/gnunet_error_codes.c:113
-msgid "Record not found."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:125
-#: src/util/gnunet_error_codes.c:125
-msgid "Zone does not contain any records."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:131
-#: src/util/gnunet_error_codes.c:131
-#, fuzzy
-msgid "Failed to lookup record."
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:137
-#: src/util/gnunet_error_codes.c:137
-#, fuzzy
-msgid "No records given."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:143
-#: src/util/gnunet_error_codes.c:143
-msgid "Record data invalid."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:149
-#: src/util/gnunet_error_codes.c:149
-msgid "No label given."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:155
-#: src/util/gnunet_error_codes.c:155
-#, fuzzy
-msgid "No results given."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:161
-#: src/util/gnunet_error_codes.c:161
-msgid "Record already exists."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:167
-#: src/util/gnunet_error_codes.c:167
-msgid "Record size exceeds maximum limit."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:173
-#: src/util/gnunet_error_codes.c:173
-msgid "There was an error in the database backend."
-msgstr ""
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:179
-#: src/util/gnunet_error_codes.c:179
-#, fuzzy
-msgid "Failed to store the given records."
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/gana/gnunet-error-codes/gnunet_error_codes.c:185
-#: src/util/gnunet_error_codes.c:185
-msgid "Label invalid or malformed."
-msgstr ""
-
-#: src/gns/gns_tld_api.c:292
+#: src/service/gns/gns_tld_api.c:292
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:573
+#: src/service/gns/gnunet-bcd.c:573
 #, fuzzy, c-format
 msgid "Invalid port number %u\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-bcd.c:614 src/namestore/gnunet-namestore-fcfsd.c:1122
+#: src/service/gns/gnunet-bcd.c:614
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1122
 #, fuzzy
 msgid "Unable to set up the daemon\n"
 msgstr "发送消息失败。\n"
 
-#: src/gns/gnunet-bcd.c:637 src/namestore/gnunet-namestore-fcfsd.c:985
+#: src/service/gns/gnunet-bcd.c:637
+#: src/service/namestore/gnunet-namestore-fcfsd.c:985
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-bcd.c:660
+#: src/service/gns/gnunet-bcd.c:660
 msgid "Run HTTP server on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:669
+#: src/service/gns/gnunet-bcd.c:669
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:296
+#: src/service/gns/gnunet-dns2gns.c:296
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-dns2gns.c:377
+#: src/service/gns/gnunet-dns2gns.c:377
 #, fuzzy
 msgid "Failed to parse DNS response!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-dns2gns.c:451
+#: src/service/gns/gnunet-dns2gns.c:451
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:654
+#: src/service/gns/gnunet-dns2gns.c:654
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:670
+#: src/service/gns/gnunet-dns2gns.c:670
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:678
+#: src/service/gns/gnunet-dns2gns.c:678
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:839
+#: src/service/gns/gnunet-dns2gns.c:839
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:999
+#: src/service/gns/gnunet-dns2gns.c:999
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:1016
+#: src/service/gns/gnunet-dns2gns.c:1016
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:582
+#: src/service/gns/gnunet-gns-benchmark.c:582
 msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:588
+#: src/service/gns/gnunet-gns-benchmark.c:588
 msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns-benchmark.c:593
+#: src/service/gns/gnunet-gns-benchmark.c:593
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:490
+#: src/service/gns/gnunet-gns-import.c:490
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:116
-#: src/hostlist/gnunet-daemon-hostlist_client.c:532
-#: src/hostlist/gnunet-daemon-hostlist_client.c:760
-#: src/hostlist/gnunet-daemon-hostlist_client.c:769
-#: src/hostlist/gnunet-daemon-hostlist_client.c:823
-#: src/hostlist/gnunet-daemon-hostlist_client.c:835
-#: src/hostlist/gnunet-daemon-hostlist_client.c:945
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1047
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1055
+#: src/service/gns/gnunet-gns-proxy.c:116
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:761
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:770
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:824
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:836
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:946
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1048
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1056
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:979
+#: src/service/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1004
+#: src/service/gns/gnunet-gns-proxy.c:1004
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1025
+#: src/service/gns/gnunet-gns-proxy.c:1025
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1040
+#: src/service/gns/gnunet-gns-proxy.c:1040
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1056
+#: src/service/gns/gnunet-gns-proxy.c:1056
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:1067
+#: src/service/gns/gnunet-gns-proxy.c:1067
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1092
+#: src/service/gns/gnunet-gns-proxy.c:1092
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1223
+#: src/service/gns/gnunet-gns-proxy.c:1223
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2135
+#: src/service/gns/gnunet-gns-proxy.c:2135
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2654
+#: src/service/gns/gnunet-gns-proxy.c:2654
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2686
+#: src/service/gns/gnunet-gns-proxy.c:2686
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2895
+#: src/service/gns/gnunet-gns-proxy.c:2895
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2919 src/rest/gnunet-rest-server.c:957
+#: src/service/gns/gnunet-gns-proxy.c:2919
+#: src/service/rest/gnunet-rest-server.c:957
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/service/gns/gnunet-gns-proxy.c:3268
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/service/gns/gnunet-gns-proxy.c:3300
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/service/gns/gnunet-gns-proxy.c:3386
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3726
+#: src/service/gns/gnunet-gns-proxy.c:3726
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3868
+#: src/service/gns/gnunet-gns-proxy.c:3868
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3873
+#: src/service/gns/gnunet-gns-proxy.c:3873
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3877
+#: src/service/gns/gnunet-gns-proxy.c:3877
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3903
+#: src/service/gns/gnunet-gns-proxy.c:3903
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:256
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "“%s”不可用。\n"
-
-#: src/gns/gnunet-gns.c:266 src/util/dnsparser.c:254
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/gns/gnunet-gns.c:280
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:304
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:339
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:345
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:351
-msgid "Specify a timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:355
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:360
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet 错误日志"
-
-#: src/gns/gnunet-service-gns.c:518
+#: src/service/gns/gnunet-service-gns.c:518
 #, fuzzy
 msgid "Properly base32-encoded public key required"
 msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-service-gns.c:554
-#: src/zonemaster/gnunet-service-zonemaster.c:1348
+#: src/service/gns/gnunet-service-gns.c:554
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1348
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:573
-#: src/zonemaster/gnunet-service-zonemaster.c:1387
+#: src/service/gns/gnunet-service-gns.c:573
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1387
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:278
+#: src/service/gns/gnunet-service-gns_interceptor.c:278
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:379
+#: src/service/gns/gnunet-service-gns_interceptor.c:379
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:669
+#: src/service/gns/gnunet-service-gns_resolver.c:669
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:681
+#: src/service/gns/gnunet-service-gns_resolver.c:681
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', trying as number.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:687
+#: src/service/gns/gnunet-service-gns_resolver.c:687
 #, c-format
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:900
+#: src/service/gns/gnunet-service-gns_resolver.c:900
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1091
+#: src/service/gns/gnunet-service-gns_resolver.c:1091
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1867
+#: src/service/gns/gnunet-service-gns_resolver.c:1867
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1882
+#: src/service/gns/gnunet-service-gns_resolver.c:1882
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1915
+#: src/service/gns/gnunet-service-gns_resolver.c:1915
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2317
+#: src/service/gns/gnunet-service-gns_resolver.c:2317
 msgid "Unable to process critical delegation record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/service/gns/gnunet-service-gns_resolver.c:2322
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2345
+#: src/service/gns/gnunet-service-gns_resolver.c:2345
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2512
+#: src/service/gns/gnunet-service-gns_resolver.c:2512
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2660
+#: src/service/gns/gnunet-service-gns_resolver.c:2660
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:137
-msgid "This is a memento of an older block for internal maintenance."
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:176
-#, fuzzy, c-format
-msgid "Unable to parse zone key record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:190
-msgid "Record type does not match parsed record type\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:213
-#, fuzzy, c-format
-msgid "Unable to parse GNS2DNS record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:230
-#, fuzzy, c-format
-msgid "Failed to serialize GNS2DNS record with value `%s': Not a DNS name.\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:254
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gns/plugin_gnsrecord_gns.c:286
-#, fuzzy, c-format
-msgid "Unable to parse BOX record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gns/plugin_rest_gns.c:450
-msgid "Gns REST API initialized\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:51
-msgid "Label is NULL which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:56
-msgid "Label  contains `.' which is not allowed\n"
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:479
-msgid "Zone delegation record not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:487
-msgid "Zone delegation record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:497
-msgid "Multiple REDIRECT records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:506 src/gnsrecord/gnsrecord_misc.c:532
-msgid "Redirection record set contains mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:513
-msgid "Redirection records not allowed in apex."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:524
-msgid "Redirection records not allowed in apex.."
-msgstr ""
-
-#: src/gnsrecord/gnsrecord_misc.c:546
-msgid "Mutually exclusive records."
-msgstr ""
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:366
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:384
-#, fuzzy, c-format
-msgid "Failed to serialize NS record with value `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:405
-#, fuzzy, c-format
-msgid "Failed to serialize CNAME record with value `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:479
-#, fuzzy, c-format
-msgid "Failed to serialize CERT record with %u bytes\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:515
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:532
-#, fuzzy, c-format
-msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:552
-#, fuzzy, c-format
-msgid "Failed to serialize PTR record with value `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:572
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:584
-#, fuzzy, c-format
-msgid "Failed to serialize MX record with hostname `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:607
-#, fuzzy, c-format
-msgid "Unable to parse SRV record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:620
-#, fuzzy, c-format
-msgid "Failed to serialize SRV record with target `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:639
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:659
-#: src/gnsrecord/plugin_gnsrecord_dns.c:673
-#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/gnsrecord/plugin_gnsrecord_dns.c:692
-#, fuzzy, c-format
-msgid "Unable to parse CAA record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/hello/gnunet-hello.c:303
-#, fuzzy, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/hello/gnunet-hello.c:310
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:315
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:324 src/hello/gnunet-hello.c:375
-#, fuzzy, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/hello/gnunet-hello.c:339
-#, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:386
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s expected size %u size written %u\n"
-msgstr "创建用户出错"
-
-#: src/hello/gnunet-hello.c:395
-#, c-format
-msgid "Modified %u addresses, wrote %u bytes\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:409
-msgid "Hello file to read"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:418
-#, fuzzy
-msgid "Print information about peers."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/hello/hello.c:1089
-#, fuzzy
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "保存配置失败。"
-
-#: src/hello/hello.c:1099
-#, fuzzy
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "保存配置失败。"
-
-#: src/hello/hello.c:1109
-#, fuzzy
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/hello/hello.c:1121
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr ""
-
-#: src/hello/hello.c:1139
-#, c-format
-msgid "Plugin `%s' not found, skipping address\n"
-msgstr ""
-
-#: src/hello/hello.c:1147
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr ""
-
-#: src/hello/hello.c:1162
-#, fuzzy, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/hostlist/gnunet-daemon-hostlist.c:306
+#: src/service/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:364
+#: src/service/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:369
+#: src/service/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:378
+#: src/service/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:350
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:351
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:372
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:373
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:376
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:377
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:393
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:394
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:665
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1439
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:666
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1440
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:697
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:698
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:740
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:741
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:874
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:875
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:889
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:890
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:909
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:910
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:915
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:916
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:923
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:924
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:979
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:980
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:988
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:989
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1125
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1126
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1712
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1135
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1136
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1193
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1214
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1194
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1215
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1375
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1376
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1380
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1381
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1391
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1432
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1433
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1436
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1487
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1494
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1526
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1546
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1539
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1540
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1640
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1641
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1669
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1670
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1682
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1683
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1696
+#: src/service/hostlist/gnunet-daemon-hostlist_client.c:1697
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:174
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:179
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:210
-#: src/hostlist/gnunet-daemon-hostlist_server.c:507
-#: src/topology/gnunet-daemon-topology.c:747
-#, fuzzy, c-format
-msgid "Error in communication with PEERSTORE service: %s\n"
-msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:236
-msgid "Expired HELLO encountered (ignored)"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:255
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:223
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:357
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:327
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:361
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:331
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:374
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:344
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:379
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:349
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:389
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:359
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:392
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:362
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:400
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:370
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:441
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:654
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:484
+#: src/service/topology/gnunet-daemon-topology.c:747
+#, fuzzy, c-format
+msgid "Error in communication with PEERSTORE service: %s\n"
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
+
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:659
 #, fuzzy
 msgid "Could not access PEERSTORE service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:665
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:670
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:682
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:694
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:699
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:709
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:745
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:750
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:766
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:771
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:809
+#: src/service/hostlist/gnunet-daemon-hostlist_server.c:814
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:225
-#, fuzzy, c-format
-msgid "Failed to create ego: %s\n"
-msgstr "发送消息失败。\n"
-
-#: src/identity/gnunet-identity.c:540
-msgid "create ego NAME"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:545
-msgid "delete ego NAME "
-msgstr ""
-
-#: src/identity/gnunet-identity.c:551
-msgid ""
-"set the private key for the identity to PRIVATE_KEY (use together with -C)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:557
-msgid ""
-"Read and decrypt message encrypted for the given ego (use together with -e "
-"EGO)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:563
-msgid ""
-"Encrypt and write message for recipient identity PULBIC_KEY, (use together "
-"with -k RECIPIENT_PUBLIC_KEY)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:568
-msgid "generate an EdDSA identity. (use together with -C) EXPERIMENTAL"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:572
-msgid "display all egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:576
-msgid "reduce output"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:583
-msgid ""
-"restrict results to NAME (use together with -d) or read and decrypt a "
-"message for NAME (use together with -R)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:589
-msgid "The public key of the recipient (with -W)"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:593
-msgid "run in monitor mode egos"
-msgstr ""
-
-#: src/identity/gnunet-identity.c:597
-#, fuzzy
-msgid "display private keys as well"
-msgstr "显示一个文件的散列值"
-
-#: src/identity/gnunet-identity.c:612
-msgid "Maintain egos"
-msgstr ""
-
-#: src/identity/gnunet-service-identity.c:687
-#: src/identity/gnunet-service-identity.c:806
+#: src/service/identity/gnunet-service-identity.c:687
+#: src/service/identity/gnunet-service-identity.c:806
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:921
+#: src/service/identity/gnunet-service-identity.c:921
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:979
+#: src/service/identity/gnunet-service-identity.c:979
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:988
+#: src/service/identity/gnunet-service-identity.c:988
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/plugin_rest_identity.c:1245
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/json/json.c:130
-#, fuzzy, c-format
-msgid "Failed to parse JSON in option `%s': %s (%s)\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/messenger/plugin_gnsrecord_messenger.c:136
-#: src/messenger/plugin_gnsrecord_messenger.c:151
+#: src/service/messenger/plugin_gnsrecord_messenger.c:136
+#: src/service/messenger/plugin_gnsrecord_messenger.c:151
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_ENTRY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/messenger/plugin_gnsrecord_messenger.c:172
-#: src/messenger/plugin_gnsrecord_messenger.c:187
+#: src/service/messenger/plugin_gnsrecord_messenger.c:172
+#: src/service/messenger/plugin_gnsrecord_messenger.c:187
 #, fuzzy, c-format
 msgid "Unable to parse MESSENGER_ROOM_DETAILS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namecache/gnunet-namecache.c:105
-#, fuzzy, c-format
-msgid "No records found for `%s'"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namecache/gnunet-namecache.c:118 src/namestore/gnunet-namestore.c:889
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:174
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/namecache/gnunet-namecache.c:181
-#, fuzzy, c-format
-msgid "Invalid public key for zone `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/namecache/gnunet-namecache.c:187
-#, fuzzy, c-format
-msgid "You must specify a name\n"
-msgstr "您必须指定一个接收方！\n"
-
-#: src/namecache/gnunet-namecache.c:213 src/namestore/gnunet-namestore.c:2021
-msgid "name of the record to add/delete/display"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:220
-msgid "specifies the public key of the zone to look in"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:2103
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet 配置"
-
-#: src/namecache/namecache_api.c:283
+#: src/service/namecache/namecache_api.c:283
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/namecache_api.c:371
+#: src/service/namecache/namecache_api.c:371
 #, fuzzy
 msgid "Error communicating with namecache service"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/namecache/plugin_namecache_flat.c:118
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:176
-#: src/namestore/plugin_namestore_flat.c:424
-#: src/peerstore/plugin_peerstore_flat.c:380
-#: src/peerstore/plugin_peerstore_flat.c:542
-#, fuzzy, c-format
-msgid "Unable to initialize file: %s.\n"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/namecache/plugin_namecache_flat.c:129
-#: src/namestore/plugin_namestore_flat.c:187
-#: src/peerstore/plugin_peerstore_flat.c:395
-#, fuzzy, c-format
-msgid "Unable to get filesize: %s.\n"
-msgstr "发送消息失败。\n"
-
-#: src/namecache/plugin_namecache_flat.c:148
-#: src/peerstore/plugin_peerstore_flat.c:407
-#, fuzzy, c-format
-msgid "Unable to read file: %s.\n"
-msgstr "发送消息失败。\n"
-
-#: src/namecache/plugin_namecache_flat.c:404
-#, fuzzy
-msgid "flat plugin running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/namecache/plugin_namecache_sqlite.c:190
-#: src/namecache/plugin_namecache_sqlite.c:204
-#, fuzzy, c-format
-msgid "Failed to setup database at `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namestore/gnunet-namestore-dbtool.c:87
-#: src/namestore/gnunet-namestore.c:1952
-#, c-format
-msgid "Superfluous command line arguments (starting with `%s') ignored\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:158
-msgid "initialize database"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:163
-msgid "reset database (DANGEROUS: All existing data is lost!"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:170
-msgid "the namestore plugin to work with, e.g. 'sqlite'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-dbtool.c:189
-#: src/namestore/gnunet-namestore-zonefile.c:753
-#, fuzzy
-msgid "GNUnet namestore database manipulation tool"
-msgstr "GNUnet 配置"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:373
+#: src/service/namestore/gnunet-namestore-fcfsd.c:373
 #, fuzzy
 msgid "can not search the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:427
-#: src/namestore/gnunet-namestore-fcfsd.c:561
+#: src/service/namestore/gnunet-namestore-fcfsd.c:427
+#: src/service/namestore/gnunet-namestore-fcfsd.c:561
 #, fuzzy
 msgid "unable to scan namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:447
+#: src/service/namestore/gnunet-namestore-fcfsd.c:447
 #, fuzzy, c-format
 msgid "Failed to create record for `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:460
+#: src/service/namestore/gnunet-namestore-fcfsd.c:460
 #, fuzzy
 msgid "no errors"
 msgstr "未知错误"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:496
+#: src/service/namestore/gnunet-namestore-fcfsd.c:496
 #, c-format
 msgid "The requested key `%s' exists as `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:503
+#: src/service/namestore/gnunet-namestore-fcfsd.c:503
 msgid "key exists"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/service/namestore/gnunet-namestore-fcfsd.c:520
 #, fuzzy
 msgid "Error creating record data\n"
 msgstr "未知错误。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:524
+#: src/service/namestore/gnunet-namestore-fcfsd.c:524
 #, fuzzy
 msgid "unable to store record"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:595
+#: src/service/namestore/gnunet-namestore-fcfsd.c:595
 #, c-format
 msgid "Requested name `%s' exists with `%u' records\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:601
+#: src/service/namestore/gnunet-namestore-fcfsd.c:601
 msgid "name exists\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:787
+#: src/service/namestore/gnunet-namestore-fcfsd.c:787
 msgid "unable to process submitted data"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:798
+#: src/service/namestore/gnunet-namestore-fcfsd.c:798
 msgid "the submitted data is invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/service/namestore/gnunet-namestore-fcfsd.c:817
 #, fuzzy
 msgid "invalid parameters"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:834
+#: src/service/namestore/gnunet-namestore-fcfsd.c:834
 #, fuzzy
 msgid "invalid name"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:845
+#: src/service/namestore/gnunet-namestore-fcfsd.c:845
 #, fuzzy, c-format
 msgid "Unable to parse key %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:849
+#: src/service/namestore/gnunet-namestore-fcfsd.c:849
 #, fuzzy
 msgid "unable to parse key"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:960
+#: src/service/namestore/gnunet-namestore-fcfsd.c:960
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1069
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1069
 #, fuzzy
 msgid "No expiration specified for records.\n"
 msgstr "没有指定接口，将使用默认。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1080
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1080
 #, fuzzy
 msgid "No port specified, using default value\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1098
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1098
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1145
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "name of the zone managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1154
+#: src/service/namestore/gnunet-namestore-fcfsd.c:1154
 msgid "GNU Name System First-Come-First-Served name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-zonefile.c:329
-#, fuzzy, c-format
-msgid "Failed to store records...\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:439
-#: src/namestore/gnunet-namestore-zonefile.c:471
-#, fuzzy, c-format
-msgid "Name `%s' is too long\n"
-msgstr "服务已删除。\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:498
-#, fuzzy, c-format
-msgid "Failed to parse $TTL\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:509
-#, fuzzy, c-format
-msgid "Failed to parse $ORIGIN from %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:520
-#, c-format
-msgid "You must provide $ORIGIN in your zonefile or via arguments (--zone)!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:529
-#, c-format
-msgid "Only %u records per unique name supported.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:591
-#, c-format
-msgid "Data `%s' invalid\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-zonefile.c:705
-#, fuzzy, c-format
-msgid "Failed to connect to NAMESTORE\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:712
-#, fuzzy, c-format
-msgid "Failed to connect to IDENTITY\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-zonefile.c:738
-#: src/namestore/gnunet-namestore.c:2088
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:411
-#, fuzzy, c-format
-msgid "Missing entries in record line `%s'.\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore.c:419
-#, fuzzy, c-format
-msgid "Unknown record type `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore.c:427 src/namestore/gnunet-namestore.c:442
-msgid "Empty record line argument is not allowed.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:434
-#, fuzzy, c-format
-msgid "Error parsing expiration time %s.\n"
-msgstr "保存配置出错。"
-
-#: src/namestore/gnunet-namestore.c:464
-#, fuzzy, c-format
-msgid "Invalid record data for type %s: `%s'.\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/namestore/gnunet-namestore.c:668
-#, c-format
-msgid "Adding record failed: %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:686 src/namestore/gnunet-namestore.c:702
-#, fuzzy, c-format
-msgid "Deleting record failed: %s\n"
-msgstr "“%s”以错误码 %d 失败：%s\n"
-
-#: src/namestore/gnunet-namestore.c:1138
-#, c-format
-msgid ""
-"A SOA record exists already under `%s', cannot add a second SOA to the same "
-"zone.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
-#, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1302
-#, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1327
-#, c-format
-msgid "%s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1356
-#, c-format
-msgid "No options given\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1370
-#, c-format
-msgid "Recordlines only work with option `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1379 src/namestore/gnunet-namestore.c:1431
-#: src/namestore/gnunet-namestore.c:1441 src/namestore/gnunet-namestore.c:1451
-#: src/namestore/gnunet-namestore.c:1480 src/namestore/gnunet-namestore.c:1501
-#: src/namestore/gnunet-namestore.c:1528 src/namestore/gnunet-namestore.c:1538
-#: src/namestore/gnunet-namestore.c:1571 src/namestore/gnunet-namestore.c:1596
-#: src/namestore/gnunet-namestore.c:1630 src/namestore/gnunet-namestore.c:1664
-#: src/namestore/gnunet-namestore.c:1687
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/namestore/gnunet-namestore.c:1381
-#, fuzzy
-msgid "name"
-msgstr "无名称"
-
-#: src/namestore/gnunet-namestore.c:1410
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "无效条目。\n"
-
-#: src/namestore/gnunet-namestore.c:1433 src/namestore/gnunet-namestore.c:1443
-#: src/namestore/gnunet-namestore.c:1453 src/namestore/gnunet-namestore.c:1482
-#: src/namestore/gnunet-namestore.c:1503 src/namestore/gnunet-namestore.c:1689
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1461
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore.c:1471
-#, c-format
-msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1491
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1510 src/namestore/gnunet-namestore.c:1696
-#, fuzzy, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/namestore/gnunet-namestore.c:1530 src/namestore/gnunet-namestore.c:1540
-msgid "del"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1573
-msgid "purge-zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1598
-msgid "list"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1632
-msgid "reverse-pkey"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1642
-#, fuzzy, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/namestore/gnunet-namestore.c:1666
-msgid "uri"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1679
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "无效条目。\n"
-
-#: src/namestore/gnunet-namestore.c:1967
-#, fuzzy, c-format
-msgid "Cannot connect to identity service\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/namestore/gnunet-namestore.c:1986
-msgid "add record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1989
-msgid "delete record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1993
-msgid "display records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1997
-msgid "read commands from stdin"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2004
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2010
-#, fuzzy
-msgid "set the desired nick name for the zone"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/namestore/gnunet-namestore.c:2015
-#, fuzzy
-msgid "monitor changes in the namestore"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore.c:2025
-#, fuzzy
-msgid "Output in recordline format"
-msgstr "以 gnuplot 格式输出"
-
-#: src/namestore/gnunet-namestore.c:2031
-#, fuzzy
-msgid "determine our name for the given KEY"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/namestore/gnunet-namestore.c:2037
-msgid "type of the record to add/delete/display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2042
-msgid "URI to import into our zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2048
-msgid "value of the record to add/delete"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2052
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2056
-msgid "omit private records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2061
-msgid "do not filter maintenance records"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2066
-msgid "purge namestore of all orphans"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2071
-msgid ""
-"show private key for orphaned records for recovery using `gnunet-identity -C "
-"-P <key>'. Use in combination with --display"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2076
-msgid "delete all records in specified zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:2082
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1835
-msgid "size to use for the main hash map"
-msgstr ""
-
-#: src/namestore/gnunet-zoneimport.c:1841
-msgid "minimum expiration time we assume for imported records"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:195
-#, c-format
-msgid "File too big to map: %llu bytes.\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:219
-#, c-format
-msgid "Namestore database file `%s' malformed\n"
-msgstr ""
-
-#: src/namestore/plugin_namestore_flat.c:792
-#, fuzzy
-msgid "Flat file database running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/namestore/plugin_namestore_sqlite.c:181
-#: src/namestore/plugin_namestore_sqlite.c:191
-#, fuzzy, c-format
-msgid "Failed to setup database with: `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/namestore/plugin_namestore_sqlite.c:956
-#, fuzzy
-msgid "SQlite database running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/namestore/plugin_rest_namestore.c:1320
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:189
-#, fuzzy
-msgid "Suggested configuration changes:\n"
-msgstr ""
-"\n"
-"您的配置更改没有保存。\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:208
-#, fuzzy, c-format
-msgid "Failed to write configuration to `%s'\n"
-msgstr "保存配置失败。"
-
-#: src/nat-auto/gnunet-nat-auto.c:215
-#, fuzzy, c-format
-msgid "Wrote updated configuration to `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/nat-auto/gnunet-nat-auto.c:327
-#, fuzzy
-msgid "run autoconfiguration"
-msgstr "配额配置"
-
-#: src/nat-auto/gnunet-nat-auto.c:335
-msgid "section name providing the configuration for the adapter"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:338 src/nat/gnunet-nat.c:446
-msgid "use TCP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:340 src/nat/gnunet-nat.c:448
-msgid "use UDP"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:345
-msgid "write configuration file (for autoconfiguration)"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-auto.c:355
-#, fuzzy
-msgid "GNUnet NAT traversal autoconfiguration"
-msgstr "GNUnet 配置"
-
-#: src/nat-auto/gnunet-nat-auto_legacy.c:377
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:685
-#: src/nat-auto/nat_auto_api_test.c:383
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:377
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:685
+#: src/service/nat-auto/nat_auto_api_test.c:383
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:483
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:483
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto_legacy.c:527
-#: src/nat-auto/nat_auto_api_test.c:532
+#: src/service/nat-auto/gnunet-nat-auto_legacy.c:527
+#: src/service/nat-auto/nat_auto_api_test.c:532
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nat-auto/gnunet-service-nat-auto.c:346
+#: src/service/nat-auto/gnunet-service-nat-auto.c:346
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:384
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:574
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:574
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:592
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:592
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:727
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:727
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:728
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:728
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:766
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:766
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:779
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:779
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:841
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:791
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:853
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:791
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:853
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829
+#: src/service/nat-auto/gnunet-service-nat-auto_legacy.c:829
 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:73
+#: src/service/nat-auto/nat_auto_api.c:73
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:76
+#: src/service/nat-auto/nat_auto_api.c:76
 msgid "IPC failure"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:79
+#: src/service/nat-auto/nat_auto_api.c:79
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:82
+#: src/service/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:85
+#: src/service/nat-auto/nat_auto_api.c:85
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:88
+#: src/service/nat-auto/nat_auto_api.c:88
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:91
+#: src/service/nat-auto/nat_auto_api.c:91
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat-auto/nat_auto_api.c:94
+#: src/service/nat-auto/nat_auto_api.c:94
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:97
+#: src/service/nat-auto/nat_auto_api.c:97
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:100
+#: src/service/nat-auto/nat_auto_api.c:100
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:103
+#: src/service/nat-auto/nat_auto_api.c:103
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat-auto/nat_auto_api.c:106
+#: src/service/nat-auto/nat_auto_api.c:106
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:109
+#: src/service/nat-auto/nat_auto_api.c:109
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:113
+#: src/service/nat-auto/nat_auto_api.c:113
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/nat-auto/nat_auto_api.c:116
+#: src/service/nat-auto/nat_auto_api.c:116
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:119
+#: src/service/nat-auto/nat_auto_api.c:119
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:122
+#: src/service/nat-auto/nat_auto_api.c:122
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:125
+#: src/service/nat-auto/nat_auto_api.c:125
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api.c:128
+#: src/service/nat-auto/nat_auto_api.c:128
 msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/nat-auto/nat_auto_api_test.c:445
+#: src/service/nat-auto/nat_auto_api_test.c:445
 #, fuzzy, c-format
 msgid "Failed to find valid PORT in section `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/nat-auto/nat_auto_api_test.c:489
+#: src/service/nat-auto/nat_auto_api_test.c:489
 #, fuzzy, c-format
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/nat/gnunet-nat.c:422
-msgid "which IP and port are we locally using to bind/listen to"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:430
-msgid "which remote IP and port should be asked for connection reversal"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:438
-msgid ""
-"name of configuration section to find additional options, such as manual "
-"host punching data"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:443
-msgid "enable STUN processing"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:453
-msgid "watch for connection reversal requests"
-msgstr ""
-
-#: src/nat/gnunet-nat.c:464
-msgid "GNUnet NAT traversal autoconfigure daemon"
-msgstr ""
-
-#: src/nat/gnunet-service-nat.c:1351
+#: src/service/nat/gnunet-service-nat.c:1351
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1362
+#: src/service/nat/gnunet-service-nat.c:1362
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1378
+#: src/service/nat/gnunet-service-nat.c:1378
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1390
+#: src/service/nat/gnunet-service-nat.c:1390
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1861
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1935
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:175
+#: src/service/nat/gnunet-service-nat_helper.c:175
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:249
+#: src/service/nat/gnunet-service-nat_helper.c:249
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/gnunet-service-nat_mini.c:188
+#: src/service/nat/gnunet-service-nat_mini.c:188
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:602
+#: src/service/nat/gnunet-service-nat_mini.c:602
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:857
+#: src/service/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864
+#: src/service/nse/gnunet-nse-profiler.c:864
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:879
+#: src/service/nse/gnunet-nse-profiler.c:879
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:888
+#: src/service/nse/gnunet-nse-profiler.c:888
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/service/nse/gnunet-nse-profiler.c:900
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:912
+#: src/service/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
-#: src/nse/gnunet-service-nse.c:1441
-#: src/revocation/gnunet-service-revocation.c:922 src/util/gnunet-scrypt.c:243
-#, fuzzy
-msgid "Value is too large.\n"
-msgstr "值不在合法范围内。"
-
-#: src/peerstore/gnunet-peerstore.c:92
+#: src/service/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:592
+#: src/service/peerstore/gnunet-service-peerstore.c:592
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:657
+#: src/service/peerstore/gnunet-service-peerstore.c:661
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/peerstore/gnunet-service-peerstore.c:677
+#: src/service/peerstore/gnunet-service-peerstore.c:681
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:688
+#: src/service/peerstore/gnunet-service-peerstore.c:692
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:718 src/peerstore/peerstore_api.c:767
+#: src/service/peerstore/peerstore_api.c:718
+#: src/service/peerstore/peerstore_api.c:767
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "输出格式未知，不应出现这种情况。\n"
 
-#: src/peerstore/peerstore_api.c:781
+#: src/service/peerstore/peerstore_api.c:781
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/peerstore_api.c:895
+#: src/service/peerstore/peerstore_api.c:895
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/service/peerstore/plugin_peerstore_sqlite.c:458
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:493
+#: src/service/peerstore/plugin_peerstore_sqlite.c:493
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:575
+#: src/service/peerstore/plugin_peerstore_sqlite.c:575
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:416
+#: src/service/pt/gnunet-daemon-pt.c:416
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:422
+#: src/service/pt/gnunet-daemon-pt.c:422
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:476
+#: src/service/pt/gnunet-daemon-pt.c:476
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:671
+#: src/service/pt/gnunet-daemon-pt.c:671
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:678
+#: src/service/pt/gnunet-daemon-pt.c:678
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/service/pt/gnunet-daemon-pt.c:716
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:771
+#: src/service/pt/gnunet-daemon-pt.c:771
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:777
+#: src/service/pt/gnunet-daemon-pt.c:777
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:786
+#: src/service/pt/gnunet-daemon-pt.c:786
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:881
+#: src/service/pt/gnunet-daemon-pt.c:881
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898
+#: src/service/pt/gnunet-daemon-pt.c:898
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1225 src/pt/gnunet-daemon-pt.c:1234
-#: src/pt/gnunet-daemon-pt.c:1250 src/pt/gnunet-daemon-pt.c:1259
-#: src/pt/gnunet-daemon-pt.c:1268
+#: src/service/pt/gnunet-daemon-pt.c:1225
+#: src/service/pt/gnunet-daemon-pt.c:1234
+#: src/service/pt/gnunet-daemon-pt.c:1250
+#: src/service/pt/gnunet-daemon-pt.c:1259
+#: src/service/pt/gnunet-daemon-pt.c:1268
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:1314
+#: src/service/pt/gnunet-daemon-pt.c:1314
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-did.c:587
-msgid "Create a DID Document and display its DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:592
-msgid "Get the DID Document associated with the given DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:597
-msgid "Remove the DID"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:601
-msgid "Replace the DID Document."
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:605
-msgid "Show the DID for a given ego"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:609
-msgid "Show egos with DIDs"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:615
-msgid "The Decentralized Identity (DID)"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:621
-msgid "The DID Document to store in GNUNET"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:626
-msgid "The name of the EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-did.c:632
-msgid "The time until the DID Document is going to expire (e.g. 5d)"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:805
-#, fuzzy, c-format
-msgid "Ego is required\n"
-msgstr "%s：选项“%s”有歧义\n"
-
-#: src/reclaim/gnunet-reclaim.c:812
-#, c-format
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:819
-#, fuzzy, c-format
-msgid "Requesting party key is required!\n"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/reclaim/gnunet-reclaim.c:837
-msgid "Add or update an attribute NAME"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:842
-msgid "Delete the attribute with ID"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:847
-msgid "The attribute VALUE"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:852
-#, fuzzy
-msgid "The EGO to use"
-msgstr "消息尺寸"
-
-#: src/reclaim/gnunet-reclaim.c:858
-msgid "Specify the relying party for issue"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:862
-msgid "List attributes for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:866
-msgid "List credentials for EGO"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:872
-msgid "Credential to use for attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:877
-msgid "Credential name"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:883
-msgid "Issue a ticket for a set of attributes separated by comma"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:888
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:893
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:898
-msgid "Type of attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:903
-msgid "Type of credential"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:907
-msgid "List tickets of ego"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:913
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/reclaim/gnunet-reclaim.c:921
-msgid "re:claimID command line tool"
-msgstr ""
-
-#: src/reclaim/plugin_rest_openid_connect.c:3095
-msgid "OpenID Connect REST API initialized\n"
-msgstr ""
-
-#: src/reclaim/plugin_rest_pabc.c:637 src/reclaim/plugin_rest_reclaim.c:1520
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
-#: src/reclaim/reclaim_api.c:544
+#: src/service/reclaim/reclaim_api.c:544
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:268
+#: src/service/regex/gnunet-daemon-regexprofiler.c:268
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/service/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1365
+#: src/service/regex/gnunet-regex-profiler.c:1365
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1407
-#: src/regex/gnunet-regex-simulation-profiler.c:632
+#: src/service/regex/gnunet-regex-profiler.c:1407
+#: src/service/regex/gnunet-regex-simulation-profiler.c:632
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1413
-#: src/regex/gnunet-regex-simulation-profiler.c:640
+#: src/service/regex/gnunet-regex-profiler.c:1413
+#: src/service/regex/gnunet-regex-simulation-profiler.c:640
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1421
+#: src/service/regex/gnunet-regex-profiler.c:1421
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1430
+#: src/service/regex/gnunet-regex-profiler.c:1430
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1450
+#: src/service/regex/gnunet-regex-profiler.c:1450
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1539
+#: src/service/regex/gnunet-regex-profiler.c:1539
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1546
+#: src/service/regex/gnunet-regex-profiler.c:1546
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1552
+#: src/service/regex/gnunet-regex-profiler.c:1552
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1559
+#: src/service/regex/gnunet-regex-profiler.c:1559
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1566
+#: src/service/regex/gnunet-regex-profiler.c:1566
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1581
+#: src/service/regex/gnunet-regex-profiler.c:1581
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:701
+#: src/service/regex/gnunet-regex-simulation-profiler.c:701
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:707
+#: src/service/regex/gnunet-regex-simulation-profiler.c:707
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:721
+#: src/service/regex/gnunet-regex-simulation-profiler.c:721
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api_announce.c:151
+#: src/service/regex/regex_api_announce.c:151
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/regex/regex_api_search.c:200
+#: src/service/regex/regex_api_search.c:200
 #, fuzzy, c-format
 msgid "Search string `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/rest/gnunet-rest-server.c:1369
+#: src/service/rest/gnunet-rest-server.c:1369
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
 
-#: src/rest/plugin_rest_config.c:428
-msgid "CONFIG REST API initialized\n"
-msgstr ""
-
-#: src/rest/plugin_rest_copying.c:211
-msgid "COPYING REST API initialized\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:114
-#, fuzzy
-msgid "Shutting down...\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/revocation/gnunet-revocation.c:146
-#, c-format
-msgid "Key `%s' is valid\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:150
-#, fuzzy, c-format
-msgid "Key `%s' has been revoked\n"
-msgstr "服务已删除。\n"
-
-#: src/revocation/gnunet-revocation.c:154
-#, fuzzy
-msgid "Internal error\n"
-msgstr "未知错误。\n"
-
-#: src/revocation/gnunet-revocation.c:180
-#, c-format
-msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:183
-msgid "Revocation failed (!)\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:189
-#, c-format
-msgid "Key for ego `%s' has been successfully revoked\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:192
-msgid "Revocation successful.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:198
-msgid "Internal error, key revocation might have failed\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:252
-msgid "Cancelling calculation.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:302
-#, c-format
-msgid "Revocation certificate for `%s' stored in `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:334
-#, c-format
-msgid "Ego `%s' not found.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:350
-#, c-format
-msgid "Error: Key is invalid\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:357
-#, c-format
-msgid "Error: revocation certificate in `%s' is not for `%s'\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:367
-msgid "Revocation certificate ready\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:379
-msgid "Continuing calculation where left off...\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:386
-msgid "Revocation certificate not ready, calculating proof of work\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:424
-#, fuzzy, c-format
-msgid "Public key `%s' malformed\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/revocation/gnunet-revocation.c:434
-msgid ""
-"Testing and revoking at the same time is not allowed, only executing test.\n"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:464
-#, fuzzy
-msgid "No filename to store revocation certificate given.\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/revocation/gnunet-revocation.c:481
-#, fuzzy, c-format
-msgid "Failed to read revocation certificate from `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/revocation/gnunet-revocation.c:489
-#, fuzzy, c-format
-msgid "Revocation certificate corrupted in `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/revocation/gnunet-revocation.c:511
-#, fuzzy
-msgid "No action specified. Nothing to do.\n"
-msgstr "没有指定接口，将使用默认。\n"
-
-#: src/revocation/gnunet-revocation.c:530
-msgid "use NAME for the name of the revocation file"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:538
-msgid ""
-"revoke the private key associated for the the private key associated with "
-"the ego NAME "
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:545
-msgid "actually perform revocation, otherwise we just do the precomputation"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:552
-msgid "test if the public key KEY has been revoked"
-msgstr ""
-
-#: src/revocation/gnunet-revocation.c:558
-#, fuzzy
-msgid "number of epochs to calculate for"
-msgstr "迭代次数"
-
-#: src/revocation/gnunet-service-revocation.c:539
+#: src/service/revocation/gnunet-service-revocation.c:539
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:549
+#: src/service/revocation/gnunet-service-revocation.c:549
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:554
+#: src/service/revocation/gnunet-service-revocation.c:554
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:558
+#: src/service/revocation/gnunet-service-revocation.c:558
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/revocation/gnunet-service-revocation.c:566
+#: src/service/revocation/gnunet-service-revocation.c:566
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:604
+#: src/service/revocation/gnunet-service-revocation.c:604
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:959
+#: src/service/revocation/gnunet-service-revocation.c:959
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/rps/gnunet-rps-profiler.c:3142
-msgid "duration of the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3148
-msgid "timeout for the profiling"
-msgstr ""
-
-#: src/rps/gnunet-rps-profiler.c:3153
-#, fuzzy
-msgid "number of PeerIDs to request"
-msgstr "迭代次数"
-
-#: src/rps/gnunet-rps-profiler.c:3170
-#, fuzzy
-msgid "Measure quality and performance of the RPS service."
-msgstr "无法访问该服务"
-
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:228
-#, fuzzy
-msgid "You must specify at least one message ID to check!\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:236
-msgid "This program needs a session identifier for comparing vectors.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:249
-#, c-format
-msgid ""
-"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
-"valid peer identifier.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:267
-msgid "Need elements to compute the scalarproduct, got none.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:290
-#, fuzzy, c-format
-msgid "Malformed input, could not parse `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:308
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int64_t.\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:338
-#, c-format
-msgid "Failed to initiate computation, were all keys unique?\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:364
-#: src/scalarproduct/gnunet-scalarproduct.c:371
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:378
-msgid ""
-"[Optional] peer to calculate our scalarproduct with. If this parameter is "
-"not given, the service will wait for a remote peer to compute the request."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:385
-msgid "Transaction ID shared with peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:396
-msgid "Calculate the Vectorproduct with a GNUnet peer."
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1119
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1032
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1359
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1356
-#, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/scalarproduct/scalarproduct_api.c:184
-msgid "Keys given to SCALARPRODUCT not unique!\n"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:624
-#, fuzzy
-msgid "number of peers in consensus"
-msgstr "迭代次数"
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:630
-msgid "dkg start delay"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:636
-msgid "dkg timeout"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:642
-msgid "threshold"
-msgstr ""
-
-#: src/secretsharing/gnunet-secretsharing-profiler.c:647
-msgid "also profile decryption"
-msgstr ""
-
-#: src/set/gnunet-service-set.c:1915 src/seti/gnunet-service-seti.c:2468
-#: src/setu/gnunet-service-setu.c:5412
-#, fuzzy
-msgid "Could not connect to CADET service\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/set/gnunet-set-ibf-profiler.c:268
-#: src/setu/gnunet-setu-ibf-profiler.c:268
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "迭代次数"
-
-#: src/set/gnunet-set-ibf-profiler.c:274
-#: src/setu/gnunet-setu-ibf-profiler.c:274
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "迭代次数"
-
-#: src/set/gnunet-set-ibf-profiler.c:281
-#: src/setu/gnunet-setu-ibf-profiler.c:281
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:287
-#: src/setu/gnunet-setu-ibf-profiler.c:287
-msgid "hash num"
-msgstr ""
-
-#: src/set/gnunet-set-ibf-profiler.c:293
-#: src/setu/gnunet-setu-ibf-profiler.c:293
-msgid "ibf size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:451 src/set/gnunet-set-profiler.c:457
-#: src/set/gnunet-set-profiler.c:480 src/seti/gnunet-seti-profiler.c:441
-#: src/seti/gnunet-seti-profiler.c:446 src/seti/gnunet-seti-profiler.c:451
-#: src/setu/gnunet-setu-profiler.c:442 src/setu/gnunet-setu-profiler.c:448
-#: src/setu/gnunet-setu-profiler.c:471
-#, fuzzy
-msgid "number of values"
-msgstr "迭代次数"
-
-#: src/set/gnunet-set-profiler.c:462 src/setu/gnunet-setu-profiler.c:453
-msgid "use byzantine mode"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:468 src/setu/gnunet-setu-profiler.c:459
-msgid "force sending full set"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:474 src/setu/gnunet-setu-profiler.c:465
-msgid "number delta operation"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:486 src/setu/gnunet-setu-profiler.c:477
-msgid "operation to execute"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:492 src/seti/gnunet-seti-profiler.c:462
-#: src/setu/gnunet-setu-profiler.c:483
-msgid "element size"
-msgstr ""
-
-#: src/set/gnunet-set-profiler.c:498 src/seti/gnunet-seti-profiler.c:467
-#: src/setu/gnunet-setu-profiler.c:489
-msgid "write statistics to file"
-msgstr ""
-
-#: src/seti/gnunet-seti-profiler.c:457
+#: src/service/seti/gnunet-seti-profiler.c:457
 msgid "return intersection instead of delta"
 msgstr ""
 
-#: src/sq/sq.c:47
-#, c-format
-msgid "Failure to bind %u-th SQL parameter\n"
-msgstr ""
-
-#: src/sq/sq.c:54
-msgid "Failure in sqlite3_reset (!)\n"
-msgstr ""
-
-#: src/sq/sq.c:126
-#, fuzzy, c-format
-msgid "Failed to reset sqlite statement with error: %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/statistics/gnunet-service-statistics.c:314
+#: src/service/statistics/gnunet-service-statistics.c:314
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:979
+#: src/service/statistics/gnunet-service-statistics.c:979
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:413
-#: src/statistics/gnunet-statistics.c:455
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:416
-#: src/statistics/gnunet-statistics.c:458
-#, fuzzy, c-format
-msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:532
-msgid "Missing argument: subsystem \n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:538
-msgid "Missing argument: name\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:577
-#, c-format
-msgid "No subsystem or name given\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:589
-#, fuzzy, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:725
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/statistics/gnunet-statistics.c:742
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/statistics/gnunet-statistics.c:751
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:783
-#, c-format
-msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:816
-msgid "limit output to statistics for the given NAME"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:821
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:827
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:832
-msgid "use as csv separator"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:838
-msgid "path to the folder containing the testbed data"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:843
-msgid "just print the statistics value"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:847
-msgid "watch value continuously"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:852
-msgid "connect to remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:857
-msgid "port for remote host"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:874
-msgid "Print statistics about GNUnet operations."
-msgstr ""
-
-#: src/statistics/statistics_api.c:749
+#: src/service/statistics/statistics_api.c:749
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/gnunet-testing.c:185
+#: src/service/testing/gnunet-testing.c:185
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:275
+#: src/service/testing/gnunet-testing.c:275
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:386
+#: src/service/testing/gnunet-testing.c:386
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:392
+#: src/service/testing/gnunet-testing.c:392
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:400
+#: src/service/testing/gnunet-testing.c:400
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:407
+#: src/service/testing/gnunet-testing.c:407
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:415
+#: src/service/testing/gnunet-testing.c:415
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:432
+#: src/service/testing/gnunet-testing.c:432
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:47 src/testing/testing.c:308
-#: src/util/gnunet-ecc.c:319
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr ""
-
-#: src/testing/list-keys.c:92
+#: src/service/testing/list-keys.c:92
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/testing.c:291
+#: src/service/testing/testing.c:291
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:743
+#: src/service/testing/testing.c:743
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1217
+#: src/service/testing/testing.c:1217
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1226
+#: src/service/testing/testing.c:1226
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1236
+#: src/service/testing/testing.c:1236
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1249
+#: src/service/testing/testing.c:1249
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1265
+#: src/service/testing/testing.c:1265
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1279
+#: src/service/testing/testing.c:1279
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1307
+#: src/service/testing/testing.c:1307
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1413
+#: src/service/testing/testing.c:1413
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1664
+#: src/service/testing/testing.c:1664
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:2795
+#: src/service/testing/testing.c:2795
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testing/testing.c:2803
+#: src/service/testing/testing.c:2803
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testing/testing.c:2811
+#: src/service/testing/testing.c:2811
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:257
+#: src/service/topology/gnunet-daemon-topology.c:257
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:451
+#: src/service/topology/gnunet-daemon-topology.c:451
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:805
+#: src/service/topology/gnunet-daemon-topology.c:805
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:870
+#: src/service/topology/gnunet-daemon-topology.c:870
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1005
+#: src/service/topology/gnunet-daemon-topology.c:1005
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-quic.c:1717
-#: src/transport/gnunet-communicator-tcp.c:3734
-#: src/transport/gnunet-communicator-udp.c:3358
-#: src/transport/gnunet-service-transport.c:11639
+#: src/service/transport/gnunet-communicator-quic.c:1717
+#: src/service/transport/gnunet-communicator-tcp.c:3734
+#: src/service/transport/gnunet-communicator-udp.c:3358
+#: src/service/transport/gnunet-service-transport.c:11639
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/transport/gnunet-communicator-quic.c:1787
+#: src/service/transport/gnunet-communicator-quic.c:1787
 msgid "GNUnet QUIC communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:4071
+#: src/service/transport/gnunet-communicator-tcp.c:4071
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:3433
+#: src/service/transport/gnunet-communicator-udp.c:3433
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:788
+#: src/service/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/gnunet-communicator-unix.c:1015
+#: src/service/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/transport/gnunet-communicator-unix.c:1060
+#: src/service/transport/gnunet-communicator-unix.c:1060
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-communicator-unix.c:1138
+#: src/service/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:406
+#: src/service/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/service/transport/gnunet-transport.c:415
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:454
+#: src/service/transport/gnunet-transport.c:454
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/service/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:477
+#: src/service/transport/gnunet-transport.c:477
 #, fuzzy
 msgid "Failed to list connections, timeout occurred\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:504
+#: src/service/transport/gnunet-transport.c:504
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:537
+#: src/service/transport/gnunet-transport.c:537
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
+#: src/service/transport/gnunet-transport.c:566
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:590 src/transport/gnunet-transport.c:619
+#: src/service/transport/gnunet-transport.c:590
+#: src/service/transport/gnunet-transport.c:619
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:592
+#: src/service/transport/gnunet-transport.c:592
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:621
+#: src/service/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:654
+#: src/service/transport/gnunet-transport.c:654
 #, c-format
 msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:689
+#: src/service/transport/gnunet-transport.c:689
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:701
+#: src/service/transport/gnunet-transport.c:701
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1103
+#: src/service/transport/gnunet-transport.c:1103
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1199
+#: src/service/transport/gnunet-transport.c:1199
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1214
+#: src/service/transport/gnunet-transport.c:1214
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1242
+#: src/service/transport/gnunet-transport.c:1242
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1248
+#: src/service/transport/gnunet-transport.c:1248
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1270 src/transport/gnunet-transport.c:1296
-#: src/transport/gnunet-transport.c:1342
+#: src/service/transport/gnunet-transport.c:1270
+#: src/service/transport/gnunet-transport.c:1296
+#: src/service/transport/gnunet-transport.c:1342
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1301
+#: src/service/transport/gnunet-transport.c:1301
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1367
+#: src/service/transport/gnunet-transport.c:1367
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1373
+#: src/service/transport/gnunet-transport.c:1373
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/service/transport/gnunet-transport.c:1377
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1383
+#: src/service/transport/gnunet-transport.c:1383
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1395
+#: src/service/transport/gnunet-transport.c:1395
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1399
+#: src/service/transport/gnunet-transport.c:1399
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1404
+#: src/service/transport/gnunet-transport.c:1404
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1408
+#: src/service/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1414
+#: src/service/transport/gnunet-transport.c:1414
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
+#: src/service/transport/gnunet-transport.c:1426
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/transport-testing-communicator.c:1055 src/util/service.c:2077
-#: src/util/service.c:2089
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/transport_api2_communication.c:761
+#: src/service/transport/transport_api2_communication.c:761
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:231 src/util/bio.c:239
-#, fuzzy, c-format
-msgid "Error reading `%s' from file: %s"
-msgstr "创建用户出错"
-
-#: src/util/bio.c:241
-msgid "End of file"
-msgstr ""
-
-#: src/util/bio.c:270
-#, fuzzy, c-format
-msgid "Error while reading `%s' from buffer: %s"
-msgstr "解析 dscl 输出时出错。\n"
-
-#: src/util/bio.c:272
-msgid "Not enough data left"
-msgstr ""
-
-#: src/util/bio.c:312
-#, fuzzy, c-format
-msgid "Invalid handle type while reading `%s'"
-msgstr "“%s”的参数无效。\n"
-
-#: src/util/bio.c:339 src/util/bio.c:796
-msgid "string length"
-msgstr ""
-
-#: src/util/bio.c:345
-#, fuzzy, c-format
-msgid "%s (while reading `%s')"
-msgstr "解析 dscl 输出时出错。\n"
-
-#: src/util/bio.c:350
-#, c-format
-msgid "Error reading length of string `%s'"
-msgstr ""
-
-#: src/util/bio.c:363
-#, c-format
-msgid "String `%s' longer than allowed (%u > %lu)"
-msgstr ""
-
-#: src/util/bio.c:687 src/util/bio.c:708
-#, fuzzy, c-format
-msgid "Error while writing `%s' to file: %s"
-msgstr "解析 dscl 输出时出错。\n"
-
-#: src/util/bio.c:689
-msgid "No associated file"
-msgstr ""
-
-#: src/util/bio.c:773
-#, fuzzy, c-format
-msgid "Invalid handle type while writing `%s'"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/util/client.c:751 src/util/client.c:942
-msgid "not a valid filename"
-msgstr ""
-
-#: src/util/client.c:1097
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:647 src/util/common_logging.c:686
-#, c-format
-msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
-msgstr ""
-
-#: src/util/common_logging.c:910
-#, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
-
-#: src/util/common_logging.c:1103
-msgid "ERROR"
-msgstr "错误"
-
-#: src/util/common_logging.c:1105
-msgid "WARNING"
-msgstr "警告"
-
-#: src/util/common_logging.c:1107
-msgid "MESSAGE"
-msgstr ""
-
-#: src/util/common_logging.c:1109
-msgid "INFO"
-msgstr "信息"
-
-#: src/util/common_logging.c:1111
-msgid "DEBUG"
-msgstr "调试"
-
-#: src/util/common_logging.c:1113
-msgid "NONE"
-msgstr ""
-
-#: src/util/common_logging.c:1114
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:1359
-msgid "unknown address"
-msgstr ""
-
-#: src/util/common_logging.c:1404
-msgid "invalid address"
-msgstr ""
-
-#: src/util/common_logging.c:1416
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
-
-#: src/util/common_logging.c:1431
-#, fuzzy, c-format
-msgid ""
-"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
-
-#: src/util/configuration.c:1073
-#, fuzzy, c-format
-msgid "Failed to parse configuration file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/configuration.c:1718
-#, fuzzy
-msgid "Not a valid relative time specification"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/util/configuration.c:1788
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:134
-#, c-format
-msgid "The following sections are available:\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:148
-#, fuzzy, c-format
-msgid "%s, %s or %s argument is required\n"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/util/configuration_helper.c:219
-#, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/configuration_helper.c:263
-#, fuzzy, c-format
-msgid "failed to load configuration defaults"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/container_bloomfilter.c:532
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:554
-#, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/crypto_ecc.c:677
-#, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/crypto_ecc_setup.c:282
-#, fuzzy
-msgid "Could not load peer's private key\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/util/crypto_random.c:372
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
-
-#: src/util/crypto_rsa.c:908
-#, fuzzy, c-format
-msgid "RSA signing failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/crypto_rsa.c:1208
-#, fuzzy, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/disk.c:843
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "“%s”应为目录！\n"
-
-#: src/util/disk.c:1222 src/util/service.c:1642
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/util/dnsparser.c:910
-#, fuzzy, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/dnsstub.c:228
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/util/dnsstub.c:371
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)\n"
-msgstr ""
-
-#: src/util/dnsstub.c:504
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/dnsstub.c:509
-#, fuzzy, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/getopt.c:566
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s：选项“%s”有歧义\n"
-
-#: src/util/getopt.c:591
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s：选项“--%s”不允许有参数\n"
-
-#: src/util/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s：选项“%c%s”不允许有参数\n"
-
-#: src/util/getopt.c:617 src/util/getopt.c:798
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s：选项“%s”要求有一个参数\n"
-
-#: src/util/getopt.c:648
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s：无法识别的选项“--%s”\n"
-
-#: src/util/getopt.c:654
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s：无法识别的选项“%c%s”\n"
-
-#: src/util/getopt.c:681
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：非法选项 -- %c\n"
-
-#: src/util/getopt.c:683
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s：无效选项 -- %c\n"
-
-#: src/util/getopt.c:712 src/util/getopt.c:848
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s：选项要求有一个参数 -- %c\n"
-
-#: src/util/getopt.c:762
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s：选项“-W %s”有歧义\n"
-
-#: src/util/getopt.c:782
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s：选项“-W %s” 不允许有参数\n"
-
-#: src/util/getopt.c:971
-#, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "请使用 --help 获取选项列表。\n"
-
-#: src/util/getopt.c:984
-#, c-format
-msgid "Option `%s' can't be used with other options.\n"
-msgstr ""
-
-#: src/util/getopt.c:996
-#, fuzzy, c-format
-msgid "Missing mandatory option `%s'.\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/util/getopt_helpers.c:64
-msgid "print the version number"
-msgstr ""
-
-#: src/util/getopt_helpers.c:111
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "长选项的必选参数对短选项也是必选的。\n"
-
-#: src/util/getopt_helpers.c:198
-msgid "print this help"
-msgstr ""
-
-#: src/util/getopt_helpers.c:263
-msgid "be verbose"
-msgstr ""
-
-#: src/util/getopt_helpers.c:379
-msgid "configure logging to use LOGLEVEL"
-msgstr ""
-
-#: src/util/getopt_helpers.c:446
-msgid "configure logging to write logs to FILENAME"
-msgstr ""
-
-#: src/util/getopt_helpers.c:463
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "更改配置文件中的一个值"
-
-#: src/util/getopt_helpers.c:499 src/util/getopt_helpers.c:813
-#: src/util/getopt_helpers.c:869
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
-
-#: src/util/getopt_helpers.c:571
-#, fuzzy, c-format
-msgid ""
-"You must pass a relative time (optionally with sign) to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
-
-#: src/util/getopt_helpers.c:578
-#, c-format
-msgid "Value given for time travel `%s' option is too big.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:596
-msgid "[+/-]MICROSECONDS"
-msgstr ""
-
-#: src/util/getopt_helpers.c:598
-msgid "modify system time by given offset (for debugging/testing only)"
-msgstr ""
-
-#: src/util/getopt_helpers.c:632
-#, fuzzy, c-format
-msgid "You must pass relative time to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
-
-#: src/util/getopt_helpers.c:686
-#, fuzzy, c-format
-msgid "You must pass absolute time to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
-
-#: src/util/getopt_helpers.c:743
-#, fuzzy, c-format
-msgid "You must pass a timestamp to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
-
-#: src/util/getopt_helpers.c:750
-#, c-format
-msgid "The maximum precision allowed for timestamps is seconds.\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:806
-#, c-format
-msgid "Your input for the '%s' option has to be a non negative number\n"
-msgstr ""
-
-#: src/util/getopt_helpers.c:876
-#, fuzzy, c-format
-msgid "You must pass a number below %u to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
-
-#: src/util/getopt_helpers.c:954
-#, c-format
-msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
-msgstr ""
-
-#: src/util/gnunet-base32.c:47
-msgid "run decoder modus, otherwise runs as encoder"
-msgstr ""
-
-#: src/util/gnunet-config.c:154
-msgid "test if the current installation supports the specified BACKEND"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid ""
-"Provide an appropriate value for CFLAGS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:165
-msgid "Is this an experimental build of GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:171
-msgid ""
-"Provide an appropriate value for LIBS to applications building on top of "
-"GNUnet"
-msgstr ""
-
-#: src/util/gnunet-config.c:177
-msgid "Provide the path under which GNUnet was installed"
-msgstr ""
-
-#: src/util/gnunet-config.c:192
-#, fuzzy
-msgid "Manipulate GNUnet configuration files"
-msgstr "更改配置文件中的一个值"
-
-#: src/util/gnunet-crypto-tvg.c:1535
-msgid "verify a test vector from stdin"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:95
-#, fuzzy, c-format
-msgid "Failed to open `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/gnunet-ecc.c:129
-#, c-format
-msgid "Generating %u keys like %s, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:137
-#, c-format
-msgid "Generating %u keys, please wait"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:178
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Failed to write to `%s': %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/util/gnunet-ecc.c:185
-#, c-format
-msgid ""
-"\n"
-"Finished!\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:187
-#, c-format
-msgid ""
-"\n"
-"Error, %u keys not generated\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:304
-#, c-format
-msgid "Hostkeys file `%s' not found\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:314
-#, fuzzy, c-format
-msgid "Hostkeys file `%s' is empty\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/util/gnunet-ecc.c:334
-#, fuzzy, c-format
-msgid "Could not read hostkey file: %s\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/util/gnunet-ecc.c:388
-msgid "No hostkey file specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:452
-msgid "list keys included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:458
-msgid "number of keys to list included in a file (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:464
-msgid "create COUNT public-private key pairs (for testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:469
-msgid "print the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:474
-msgid "print the private key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:479
-msgid "print the public key in HEX format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:485
-msgid "print examples of ECC operations (used for compatibility testing)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:499
-#, fuzzy
-msgid "Manipulate GNUnet private ECC key files"
-msgstr "更改配置文件中的一个值"
-
-#: src/util/gnunet-qr.c:130 src/util/gnunet-qr.c:556
-#, fuzzy, c-format
-msgid "Failed to add URI %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/util/gnunet-qr.c:134
-#, fuzzy, c-format
-msgid "Added URI %s\n"
-msgstr "无效条目。\n"
-
-#: src/util/gnunet-qr.c:161
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `gnunet://'\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-
-#: src/util/gnunet-qr.c:171
-#, c-format
-msgid "Invalid URI: fails to specify a subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:182
-#, c-format
-msgid "No known handler for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:218
-#, fuzzy, c-format
-msgid "Unable to start child process `%s'\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/util/gnunet-qr.c:247
-#, fuzzy, c-format
-msgid "Failed to open device: `%s': %d\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/gnunet-qr.c:261
-#, fuzzy
-msgid "Capturing...\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/util/gnunet-qr.c:270 src/util/gnunet-qr.c:485
-msgid "No captured images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:274 src/util/gnunet-qr.c:489
-#, c-format
-msgid "Got %d images\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:321 src/util/gnunet-qr.c:502
-#, c-format
-msgid "Found %s: \"%s\"\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:365 src/util/gnunet-qr.c:367
-#, fuzzy, c-format
-msgid "%s is not a PNG file\n"
-msgstr "更改 GNUnet 目录的权限出错"
-
-#: src/util/gnunet-qr.c:546
-msgid "No data found\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:562
-msgid "Dispatching the URI\n"
-msgstr ""
-
-#: src/util/gnunet-qr.c:573
-msgid "use the video device DEVICE (defaults to /dev/video0)"
-msgstr ""
-
-#: src/util/gnunet-qr.c:580
-msgid "read from the PNG-encoded file FILE"
-msgstr ""
-
-#: src/util/gnunet-qr.c:591
-msgid "Scan a QR code and import the URI read"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:169
-msgid "perform a reverse lookup"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:183
-msgid "Use built-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:215
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:281
-msgid "number of bits to require for the proof of work"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:287
-msgid "file with private key, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:293
-msgid "file with proof of work, otherwise default is used"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:299
-msgid "time to wait between calculations"
-msgstr ""
-
-#: src/util/gnunet-scrypt.c:313
-#, fuzzy
-msgid "Manipulate GNUnet proof of work files"
-msgstr "更改配置文件中的一个值"
-
-#: src/util/gnunet-service-resolver.c:1288
+#: src/service/util/gnunet-service-resolver.c:1288
 msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
-#, c-format
-msgid "No URI specified on command line\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:95
-#, fuzzy, c-format
-msgid "Invalid URI: does not start with `%s'\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-
-#: src/util/gnunet-uri.c:102
-#, c-format
-msgid "Invalid URI: fails to specify subsystem\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:109
-#, c-format
-msgid "No handler known for subsystem `%s'\n"
-msgstr ""
-
-#: src/util/gnunet-uri.c:179
-msgid "Perform default-actions for GNUnet URIs"
-msgstr ""
-
-#: src/util/helper.c:304
-#, fuzzy, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/util/helper.c:356
-#, fuzzy, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/helper.c:571
-#, fuzzy, c-format
-msgid "Error writing to `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/util/network.c:163
-#, c-format
-msgid "Unable to shorten unix path `%s' while keeping name unique\n"
-msgstr ""
-
-#: src/util/network.c:1284
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
-msgstr ""
-
-#: src/util/os_installation.c:416
-#, fuzzy, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr "无法确定安装路径。请尝试设置“%s”\n"
-
-#: src/util/os_installation.c:787
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/util/os_installation.c:820
-#, c-format
-msgid "Binary `%s' exists, but is not SUID\n"
-msgstr ""
-
-#: src/util/plugin.c:87
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "插件机构初始化失败：%s！\n"
-
-#: src/util/plugin.c:158
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr ""
-
-#: src/util/plugin.c:215
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
-msgstr ""
-
-#: src/util/plugin.c:371
-#, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "无法确定用户界面定义文件。"
-
-#: src/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/program.c:314
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s'. Exiting ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/program.c:329
-#, fuzzy
-msgid "Malformed configuration. Exiting ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/regex.c:123
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
-#: src/util/resolver_api.c:221
-#, c-format
-msgid ""
-"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:243
-#, c-format
-msgid ""
-"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
-"resolution will be unavailable.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:888
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-
-#: src/util/resolver_api.c:1086
-msgid "Resolver not configured correctly.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:1175 src/util/resolver_api.c:1198
-#: src/util/resolver_api.c:1212
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN: %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/util/service.c:654
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVICE_client_continue' after %s\n"
-msgstr ""
-
-#: src/util/service.c:838
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/util/service.c:951
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:992
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:1401
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/service.c:1413
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-
-#: src/util/service.c:1420
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/service.c:1481
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1505
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1573
-msgid ""
-"Could not bind to any of the ports I was supposed to, refusing to run!\n"
-msgstr ""
-
-#: src/util/service.c:1644
-msgid "No such user"
-msgstr "无此用户"
-
-#: src/util/service.c:1658
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”：%s\n"
-
-#: src/util/service.c:1751
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1756
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1761
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:2001
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/service.c:2099
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/socks.c:636
-#, c-format
-msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
-msgstr ""
-
-#: src/util/socks.c:653
-#, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
-msgstr ""
-
-#: src/util/strings.c:394
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
-msgstr ""
-
-#: src/util/strings.c:513
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
-
-#: src/util/strings.c:1049
-msgid "IPv6 address did not start with `['\n"
-msgstr ""
-
-#: src/util/strings.c:1057
-msgid "IPv6 address did contain ':' to separate port number\n"
-msgstr ""
-
-#: src/util/strings.c:1064
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr ""
-
-#: src/util/strings.c:1072
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr ""
-
-#: src/util/strings.c:1081
-#, fuzzy, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/util/strings.c:1263 src/util/strings.c:1274
-msgid "Port not in range\n"
-msgstr ""
-
-#: src/util/strings.c:1283
-#, fuzzy, c-format
-msgid "Malformed port policy `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/strings.c:1354 src/util/strings.c:1383 src/util/strings.c:1430
-#: src/util/strings.c:1450
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/util/strings.c:1408
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-
-#: src/util/strings.c:1459
-#, fuzzy, c-format
-msgid "Invalid format: `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/util/strings.c:1501
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-
-#: src/util/strings.c:1551
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
-
-#: src/util/strings.c:1582
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
-
-#: src/util/time.c:901 src/util/time.c:929
-#, c-format
-msgid "Failed to map `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/util/time.c:937
-#, c-format
-msgid ""
-"Failed to setup monotonic time file `%s', cannot assure monotonic time!\n"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1798
+#: src/service/vpn/gnunet-service-vpn.c:523
+#: src/service/vpn/gnunet-service-vpn.c:1798
 msgid "# Active channels"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:582
+#: src/service/vpn/gnunet-service-vpn.c:582
 msgid "# Messages dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:735
+#: src/service/vpn/gnunet-service-vpn.c:735
 msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1111
+#: src/service/vpn/gnunet-service-vpn.c:1111
 msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1261
+#: src/service/vpn/gnunet-service-vpn.c:1261
 msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1460
+#: src/service/vpn/gnunet-service-vpn.c:1460
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:1684
+#: src/service/vpn/gnunet-service-vpn.c:1684
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1820
+#: src/service/vpn/gnunet-service-vpn.c:1820
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2018
+#: src/service/vpn/gnunet-service-vpn.c:2018
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/service/vpn/gnunet-service-vpn.c:2044
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2281
+#: src/service/vpn/gnunet-service-vpn.c:2281
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2315 src/vpn/gnunet-service-vpn.c:2347
+#: src/service/vpn/gnunet-service-vpn.c:2315
+#: src/service/vpn/gnunet-service-vpn.c:2347
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/service/vpn/gnunet-service-vpn.c:2354
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2370
+#: src/service/vpn/gnunet-service-vpn.c:2370
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2410
+#: src/service/vpn/gnunet-service-vpn.c:2410
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2462
+#: src/service/vpn/gnunet-service-vpn.c:2462
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2704
+#: src/service/vpn/gnunet-service-vpn.c:2496
+#: src/service/vpn/gnunet-service-vpn.c:2704
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2749
+#: src/service/vpn/gnunet-service-vpn.c:2749
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3007
+#: src/service/vpn/gnunet-service-vpn.c:3007
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3035
+#: src/service/vpn/gnunet-service-vpn.c:3035
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3045
+#: src/service/vpn/gnunet-service-vpn.c:3045
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3061
+#: src/service/vpn/gnunet-service-vpn.c:3061
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3078
+#: src/service/vpn/gnunet-service-vpn.c:3078
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3090
+#: src/service/vpn/gnunet-service-vpn.c:3090
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:142
-#, fuzzy
-msgid "Error creating tunnel\n"
-msgstr "创建用户出错"
-
-#: src/vpn/gnunet-vpn.c:188 src/vpn/gnunet-vpn.c:225
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:202
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "%s：选项“%s”有歧义\n"
-
-#: src/vpn/gnunet-vpn.c:216
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:239
-#, fuzzy, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "“%s”不可用。\n"
-
-#: src/vpn/gnunet-vpn.c:258
-#, fuzzy, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "“%s”不可用。\n"
-
-#: src/vpn/gnunet-vpn.c:295
-msgid "request that result should be an IPv4 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:301
-msgid "request that result should be an IPv6 address"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:308
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:315
-msgid "destination IP for the tunnel"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:322
-msgid "peer offering the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:329
-msgid "name of the service we would like to access"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:334
-msgid "service is offered via TCP"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:339
-msgid "service is offered via UDP"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:353
-msgid "Setup tunnels via VPN."
-msgstr ""
-
-#: src/zonemaster/gnunet-service-zonemaster.c:501
+#: src/service/zonemaster/gnunet-service-zonemaster.c:501
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/zonemaster/gnunet-service-zonemaster.c:1335
+#: src/service/zonemaster/gnunet-service-zonemaster.c:1335
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
diff --git a/src/cli/gns/Makefile.am b/src/cli/gns/Makefile.am
index 90875df2d..4fcd91065 100644
--- a/src/cli/gns/Makefile.am
+++ b/src/cli/gns/Makefile.am
@@ -74,7 +74,6 @@ check_SCRIPTS = \
 EXTRA_DIST = \
   test_gns_defaults.conf \
   test_gns_lookup.conf \
-  test_gns_proxy.conf \
   test_gns_simple_lookup.conf \
   openssl.cnf \
   gnunet-gns-proxy-setup-ca.in \
@@ -98,7 +97,6 @@ EXTRA_DIST = \
   test_gns_soa_lookup.sh\
   test_gns_revocation.sh\
   test_gns_redirect_lookup.sh\
-  test_proxy.sh\
         $(pkgdata_DATA) \
   test_gnunet_gns.sh.in
 
diff --git a/src/cli/gns/meson.build b/src/cli/gns/meson.build
index 57f4f3c5f..4374b8413 100644
--- a/src/cli/gns/meson.build
+++ b/src/cli/gns/meson.build
@@ -46,7 +46,6 @@ testconfigs = [
   'test_gns_lookup.conf',
   'test_gns_lookup_peer1.conf',
   'test_gns_lookup_peer2.conf',
-  'test_gns_proxy.conf',
   'test_gns_simple_lookup.conf'
 ]
 
diff --git a/src/service/gns/openssl.cnf b/src/cli/gns/openssl.cnf
index a2561b9b2..a2561b9b2 100644
--- a/src/service/gns/openssl.cnf
+++ b/src/cli/gns/openssl.cnf
diff --git a/src/service/gns/test_gnunet_gns.sh.in b/src/cli/gns/test_gnunet_gns.sh.in
index d0c07b4e4..d0c07b4e4 100755
--- a/src/service/gns/test_gnunet_gns.sh.in
+++ b/src/cli/gns/test_gnunet_gns.sh.in
diff --git a/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey b/src/cli/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
index 895946037..895946037 100644
--- a/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
+++ b/src/cli/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
diff --git a/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey b/src/cli/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
index 3ef49f0ac..3ef49f0ac 100644
--- a/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
+++ b/src/cli/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
diff --git a/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey b/src/cli/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
index 89e0b3a0a..89e0b3a0a 100644
--- a/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
+++ b/src/cli/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
diff --git a/src/service/gns/zonefiles/test_zonekey b/src/cli/gns/zonefiles/test_zonekey
index 870c56315..870c56315 100644
--- a/src/service/gns/zonefiles/test_zonekey
+++ b/src/cli/gns/zonefiles/test_zonekey
diff --git a/src/cli/namestore/Makefile.am b/src/cli/namestore/Makefile.am
index 86ab2f0f7..b666c8851 100644
--- a/src/cli/namestore/Makefile.am
+++ b/src/cli/namestore/Makefile.am
@@ -66,6 +66,5 @@ check_SCRIPTS = \
   test_namestore_zonefile_import.sh
 
 EXTRA_DIST = \
-  test_hostkey \
   example_zonefile \
   $(check_SCRIPTS)
diff --git a/src/cli/revocation/Makefile.am b/src/cli/revocation/Makefile.am
index e4d6a6f35..6bd4919f9 100644
--- a/src/cli/revocation/Makefile.am
+++ b/src/cli/revocation/Makefile.am
@@ -48,5 +48,4 @@ test_local_revocation.py: test_local_revocation.py.in Makefile
         $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_local_revocation.py.in > test_local_revocation.py
         chmod +x test_local_revocation.py
 
-EXTRA_DIST = test_revocation.conf \
-        test_local_revocation.py.in
+EXTRA_DIST = test_local_revocation.py.in
diff --git a/src/service/fs/test_plugin_block_fs.c b/src/plugin/fs/test_plugin_block_fs.c
index f15d10b17..f15d10b17 100644
--- a/src/service/fs/test_plugin_block_fs.c
+++ b/src/plugin/fs/test_plugin_block_fs.c
diff --git a/src/plugin/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
index ac2e2592b..0ccbf9ea1 100644
--- a/src/plugin/namecache/Makefile.am
+++ b/src/plugin/namecache/Makefile.am
@@ -34,10 +34,6 @@ POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la
 POSTGRES_TESTS = test_plugin_namecache_postgres
 endif
 
-# testcases do not even build yet; thus: experimental!
-TESTING_TESTS = \
- test_namecache_api_cache_block
-
 if HAVE_SQLITE
 check_PROGRAMS = \
  $(SQLITE_TESTS) \
diff --git a/src/service/namecache/test_plugin_namecache.c b/src/plugin/namecache/test_plugin_namecache.c
index 141698a23..141698a23 100644
--- a/src/service/namecache/test_plugin_namecache.c
+++ b/src/plugin/namecache/test_plugin_namecache.c
diff --git a/src/service/namecache/test_plugin_namecache_flat.conf b/src/plugin/namecache/test_plugin_namecache_flat.conf
index efe77e37a..efe77e37a 100644
--- a/src/service/namecache/test_plugin_namecache_flat.conf
+++ b/src/plugin/namecache/test_plugin_namecache_flat.conf
diff --git a/src/service/namecache/test_plugin_namecache_postgres.conf b/src/plugin/namecache/test_plugin_namecache_postgres.conf
index 8473857d5..8473857d5 100644
--- a/src/service/namecache/test_plugin_namecache_postgres.conf
+++ b/src/plugin/namecache/test_plugin_namecache_postgres.conf
diff --git a/src/service/namecache/test_plugin_namecache_sqlite.conf b/src/plugin/namecache/test_plugin_namecache_sqlite.conf
index 24eecd286..24eecd286 100644
--- a/src/service/namecache/test_plugin_namecache_sqlite.conf
+++ b/src/plugin/namecache/test_plugin_namecache_sqlite.conf
diff --git a/src/plugin/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
index 3c8e9d170..e413c1b08 100644
--- a/src/plugin/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -434,6 +434,5 @@ EXTRA_DIST = \
   perf_namestore_api_sqlite.conf \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
-  test_hostkey \
   $(check_SCRIPTS) \
   $(sql_DATA)
diff --git a/src/plugin/namestore/test_hostkey b/src/plugin/namestore/test_hostkey
deleted file mode 100644
index e69de29bb..000000000
--- a/src/plugin/namestore/test_hostkey
+++ /dev/null
diff --git a/src/service/reclaim/pabc_helper.c b/src/plugin/reclaim/pabc_helper.c
index 65a633f7b..65a633f7b 100644
--- a/src/service/reclaim/pabc_helper.c
+++ b/src/plugin/reclaim/pabc_helper.c
diff --git a/src/service/reclaim/pabc_helper.h b/src/plugin/reclaim/pabc_helper.h
index 045ad5dda..045ad5dda 100644
--- a/src/service/reclaim/pabc_helper.h
+++ b/src/plugin/reclaim/pabc_helper.h
diff --git a/src/rest-plugin/reclaim/Makefile.am b/src/rest-plugin/reclaim/Makefile.am
index 76ca198ab..7bc305bef 100644
--- a/src/rest-plugin/reclaim/Makefile.am
+++ b/src/rest-plugin/reclaim/Makefile.am
@@ -68,7 +68,7 @@ endif
 if HAVE_PABC
 libgnunet_plugin_rest_pabc_la_SOURCES = \
   plugin_rest_pabc.c \
-  pabc_helper.c
+  $(top_builddir)/src/plugin/reclaim/pabc_helper.c
 libgnunet_plugin_rest_pabc_la_LIBADD = \
   $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
   $(top_builddir)/src/lib/json/libgnunetjson.la \
diff --git a/src/cli/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf
index 3dfeacafe..3dfeacafe 100644
--- a/src/cli/gns/test_gns_proxy.conf
+++ b/src/service/gns/test_gns_proxy.conf