[GNUnet-SVN] [gnunet-gtk] branch master updated: update pot files

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-gtk] branch master updated: update pot files

From:	gnunet
Subject:	[GNUnet-SVN] [gnunet-gtk] branch master updated: update pot files
Date:	Tue, 05 Jun 2018 23:35:13 +0200
This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 521f9bb9 update pot files
521f9bb9 is described below

commit 521f9bb9f984a7829ff80d9e6658c467f92fd7b8
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Jun 5 23:35:01 2018 +0200

    update pot files
---
 po/POTFILES.in    |   33 +-
 po/da.po          | 3647 +++++++++++++++++++++++++++++--------------------
 po/de.po          | 3950 ++++++++++++++++++++++++++++++++---------------------
 po/es.po          | 3938 ++++++++++++++++++++++++++++++++--------------------
 po/fr.po          | 3649 +++++++++++++++++++++++++++++--------------------
 po/gnunet-gtk.pot | 3590 +++++++++++++++++++++++++++++-------------------
 po/sv.po          | 3640 ++++++++++++++++++++++++++++--------------------
 po/tr.po          | 3688 +++++++++++++++++++++++++++++--------------------
 po/vi.po          | 3649 +++++++++++++++++++++++++++++--------------------
 9 files changed, 18025 insertions(+), 11759 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e4079884..8687613b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,17 @@
-src/fs/gnunet-fs-gtk.c
+src/conversation/gnunet-conversation-gtk_about.c
+src/conversation/gnunet-conversation-gtk.c
+src/conversation/gnunet-conversation-gtk_contacts.c
+src/conversation/gnunet-conversation-gtk_egos.c
+src/conversation/gnunet-conversation-gtk_get_label.c
+src/conversation/gnunet-conversation-gtk_history.c
+src/conversation/gnunet-conversation-gtk_import.c
+src/conversation/gnunet-conversation-gtk_log.c
+src/conversation/gnunet-conversation-gtk_phone.c
+src/conversation/gnunet-conversation-gtk_visibility.c
+src/conversation/gnunet-conversation-gtk_zones.c
 src/fs/gnunet-fs-gtk_about.c
 src/fs/gnunet-fs-gtk_anonymity-widgets.c
+src/fs/gnunet-fs-gtk.c
 src/fs/gnunet-fs-gtk_common.c
 src/fs/gnunet-fs-gtk_download-save-as.c
 src/fs/gnunet-fs-gtk_event-handler.c
@@ -14,9 +25,9 @@ src/fs/gnunet-fs-gtk_publish-dialog.c
 src/fs/gnunet-fs-gtk_publish-edit-dialog.c
 src/fs/gnunet-fs-gtk_unindex.c
 src/fs/metatypes.c
-src/identity/gnunet-identity-gtk.c
 src/identity/gnunet-identity-gtk_about.c
 src/identity/gnunet-identity-gtk_advertise.c
+src/identity/gnunet-identity-gtk.c
 src/lib/about.c
 src/lib/animations.c
 src/lib/eventloop.c
@@ -25,11 +36,11 @@ src/lib/misc.c
 src/lib/nls.c
 src/lib/os_installation.c
 src/lib/trayicon.c
-src/main/gnunet-gtk.c
 src/namestore/gnunet-namestore-gtk.c
 src/namestore/gnunet-namestore-gtk_edit.c
-src/namestore/plugin_gtk_namestore_a.c
 src/namestore/plugin_gtk_namestore_aaaa.c
+src/namestore/plugin_gtk_namestore_a.c
+src/namestore/plugin_gtk_namestore_box.c
 src/namestore/plugin_gtk_namestore_cname.c
 src/namestore/plugin_gtk_namestore_gns2dns.c
 src/namestore/plugin_gtk_namestore_leho.c
@@ -40,11 +51,13 @@ src/namestore/plugin_gtk_namestore_ptr.c
 src/namestore/plugin_gtk_namestore_soa.c
 src/namestore/plugin_gtk_namestore_srv.c
 src/namestore/plugin_gtk_namestore_template.c
+src/namestore/plugin_gtk_namestore_tlsa.c
 src/namestore/plugin_gtk_namestore_txt.c
 src/namestore/plugin_gtk_namestore_vpn.c
 src/peerinfo/gnunet-peerinfo-gtk-about.c
-src/peerinfo/gnunet-peerinfo-gtk-flags.c
 src/peerinfo/gnunet-peerinfo-gtk.c
+src/peerinfo/gnunet-peerinfo-gtk-flags.c
+src/setup/gnunet-setup.c
 src/setup/gnunet-setup-datacache-config.c
 src/setup/gnunet-setup-datacache-plugins.c
 src/setup/gnunet-setup-datastore-config.c
@@ -61,14 +74,15 @@ src/setup/gnunet-setup-transport-plugins.c
 src/setup/gnunet-setup-transport-tcp.c
 src/setup/gnunet-setup-transport-test.c
 src/setup/gnunet-setup-transport-udp.c
-src/setup/gnunet-setup-transport.c
-src/setup/gnunet-setup.c
 src/statistics/functions.c
 src/statistics/gnunet-statistics-gtk-about.c
 src/statistics/gnunet-statistics-gtk.c
 src/statistics/gtk_statistics.c
 src/statistics/gtk_statistics_demo.c
 src/statistics/statistics.c
+contrib/gnunet_conversation_gtk_about_window.glade
+contrib/gnunet_conversation_gtk_enter_label.glade
+contrib/gnunet_conversation_gtk_main_window.glade
 contrib/gnunet_fs_gtk_about_window.glade
 contrib/gnunet_fs_gtk_download_as_dialog.glade
 contrib/gnunet_fs_gtk_edit_publication.glade
@@ -89,8 +103,10 @@ contrib/gnunet_gtk_status_bar_menu.glade
 contrib/gnunet_identity_gtk_about_window.glade
 contrib/gnunet_identity_gtk_advertise_dialog.glade
 contrib/gnunet_identity_gtk_main_window.glade
-contrib/gnunet_namestore_edit_a.glade
 contrib/gnunet_namestore_edit_aaaa.glade
+contrib/gnunet_namestore_edit_a.glade
+contrib/gnunet_namestore_edit_box.glade
+contrib/gnunet_namestore_edit_cert.glade
 contrib/gnunet_namestore_edit_cname.glade
 contrib/gnunet_namestore_edit_gns2dns.glade
 contrib/gnunet_namestore_edit_leho.glade
@@ -100,6 +116,7 @@ contrib/gnunet_namestore_edit_pkey.glade
 contrib/gnunet_namestore_edit_ptr.glade
 contrib/gnunet_namestore_edit_soa.glade
 contrib/gnunet_namestore_edit_srv.glade
+contrib/gnunet_namestore_edit_tlsa.glade
 contrib/gnunet_namestore_edit_txt.glade
 contrib/gnunet_namestore_edit_vpn.glade
 contrib/gnunet_namestore_gtk_about_window.glade
diff --git a/po/da.po b/po/da.po
index 3126eb10..eb40e0dc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2010-02-28 12:25+0100\n"
 "Last-Translator: Joe Hansen <address@hidden>\n"
 "Language-Team: Danish <address@hidden>\n"
@@ -23,30 +23,181 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Vælg alle filer"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ugyldig URI »%s«"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "Ugyldig URI »%s«"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "Ugyldig URI »%s«"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, fuzzy, c-format
+msgid "Adding contact failed: %s\n"
+msgstr "Fejl under filoverførsel: »%s«"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "Kunne ikke oprette namespace.Consult logfiler."
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "Kunne ikke oprette namespace.Consult logfiler."
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+#, fuzzy
+msgid "connected"
+msgstr "<b>Afbrudt</b>"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+msgid "Failed to setup phone (internal error)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, fuzzy, c-format
+msgid "Resolving `%s'."
+msgstr "Henter »%s«\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, fuzzy, c-format
+msgid "Calling `%s'."
+msgstr "Henter »%s«\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr ""
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -54,12 +205,12 @@ msgid ""
 "be a C string\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 #, fuzzy
 msgid "no description supplied"
 msgstr "Samling stoppede.\n"
@@ -69,110 +220,110 @@ msgstr "Samling stoppede.\n"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 #, fuzzy
 msgid "_Download"
 msgstr "H_ent"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 #, fuzzy
 msgid "Download _recursively"
 msgstr "r_ekursivt"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 #, fuzzy
 msgid "Download _as..."
 msgstr "H_ent"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 #, fuzzy
 msgid "_Abort download"
 msgstr "H_ent"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr "_Kopier URI til udklipsholderen"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Udgi_v"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr "Kunne ikke oprette navnerum-URI fra »%s«.\n"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "Kunne ikke oprette namespace.Consult logfiler."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, fuzzy, c-format
 msgid "Processed file `%s'.\n"
 msgstr "Fejl under tilgang til fil »%s«."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 #, fuzzy
 msgid "Select a type"
 msgstr "Vælg alle filer"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, fuzzy, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "Fejl under kortlægning af fil »%s« til hukommelsen."
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr ""
 
@@ -181,116 +332,126 @@ msgstr ""
 msgid "Could not access indexed file `%s'\n"
 msgstr "Fejl under tilgang til fil »%s«."
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Kunstner"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Kunstner"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, fuzzy, c-format
 msgid "Failed to load animation from file `%s'\n"
 msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "Ugyldig URI »%s«"
 
-#: src/lib/glade.c:123
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
 
-#: src/main/gnunet-gtk.c:220
-#, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+#: src/lib/glade.c:133
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+msgid "<new zone>"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, fuzzy, c-format
 msgid "Operation failed: `%s'\n"
 msgstr "Fejl under filoverførsel: »%s«"
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+msgid "Failed to communicate with database"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -298,49 +459,66 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2258
-#, c-format
-msgid "Got invalid record name `%s' from namestore\n"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<n>Udgivelser</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 #, fuzzy
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr "Kunne ikke indsætte indhold i navnerum (se logfiler).\n"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "Kunne ikke oprette namespace.Consult logfiler."
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -356,16 +534,133 @@ msgstr ""
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "Kunne ikke oprette namespace.Consult logfiler."
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+#, fuzzy
+msgid "Name resolution failed\n"
+msgstr "Fejl under filoverførsel: »%s«"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, c-format
+msgid "Unsupported address family %d\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "Kunne ikke oprette namespace.Consult logfiler."
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:209
+#, fuzzy, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
+
+#: src/setup/gnunet-setup.c:271
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "Om gnunet-gtk"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -397,490 +692,408 @@ msgid ""
 "server!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1255
-msgid "How many bytes per second are we allowed to transmit?"
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1267
-msgid "How many bytes per second are we allowed to receive?"
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1281
-msgid "Enable communication via TCP"
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1293
-msgid "Enable communication via UDP"
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1305
-msgid "Enable communication via HTTP as a server"
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1317
-msgid "Enable communication via HTTP as a client"
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1329
-msgid "Enable communication via HTTPS as a server"
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1341
-msgid "Enable communication via HTTPS as a client"
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1353
-msgid "Enable communication via DV"
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1365
-msgid "Enable communication via WLAN"
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1377
-msgid "Port we bind to for TCP"
+#: src/setup/gnunet-setup-options.c:1483
+msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
-msgid "Port visible to other peers"
+#: src/setup/gnunet-setup-options.c:1495
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1509
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1521
+msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
+#: src/setup/gnunet-setup-options.c:1533
+msgid "Enable communication via HTTP as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
+#: src/setup/gnunet-setup-options.c:1545
+msgid "Enable communication via HTTP as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
+#: src/setup/gnunet-setup-options.c:1557
+msgid "Enable communication via HTTPS as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
+#: src/setup/gnunet-setup-options.c:1569
+msgid "Enable communication via HTTPS as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1581
+msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
+#: src/setup/gnunet-setup-options.c:1593
+msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1605
+msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
+msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr ""
 "Hvor vigtig er filen (bruges til at prioritere data i det lokale lager)."
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 #, fuzzy
 msgid "Configuration file for MySQL access"
 msgstr "_Konfigurationsfil anvendt for gnunetd:"
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 #, fuzzy
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "_Konfigurationsfil anvendt for gnunetd:"
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr ""
 "Hvor vigtig er filen (bruges til at prioritere data i det lokale lager)."
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2180
+msgid "Should the PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 #, fuzzy
 msgid "Specification of .gnunet hosted services"
 msgstr "Angiv her placeringen af »gnunetd.conf«"
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
+#: src/statistics/functions.c:519
+msgid "Connectivity"
+msgstr "Tilslutning"
 
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:227
-#, fuzzy, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
-
-#: src/setup/gnunet-setup.c:279
-#, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Kunne ikke finde håndtering for »%s«\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "Om gnunet-gtk"
-
-#: src/setup/gnunet-setup.c:631
-#, fuzzy
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr "Start konfigurationsgu_iden"
-
-#: src/setup/gnunet-setup.c:652
-#, fuzzy
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr "Start konfigurationsgu_iden"
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr "Tilslutning"
-
-#: src/statistics/functions.c:520
-msgid "# connected nodes (100% = connection table size)"
-msgstr "# forbundne knuder (100 % = størrelse på forbindelsestabel)"
+#: src/statistics/functions.c:520
+msgid "# connected nodes (100% = connection table size)"
+msgstr "# forbundne knuder (100 % = størrelse på forbindelsestabel)"
 
 #: src/statistics/functions.c:528
 msgid "System load"
@@ -937,7 +1150,7 @@ msgstr "Rutereffektivitet"
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr "Gennemsnitlig (rød) effektivitet (100 % = perfekt)"
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 
@@ -946,6 +1159,19 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr "Forbundet til %Lu modparter"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -955,6 +1181,7 @@ msgstr "Forbundet til %Lu modparter"
 msgid "Developed by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -964,6 +1191,7 @@ msgstr ""
 msgid "Documented by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -973,6 +1201,7 @@ msgstr ""
 msgid "Translated by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -982,6 +1211,7 @@ msgstr ""
 msgid "Artwork by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -992,6 +1222,7 @@ msgstr ""
 msgid "Credits"
 msgstr "Vis bidragydere"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -1001,116 +1232,342 @@ msgstr "Vis bidragydere"
 msgid "License"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Filnavn"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+#, fuzzy
+msgid "_Caller Identity"
+msgstr "Identitet"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr "_Logfiler"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+#, fuzzy
+msgid "<b>Caller Identity</b>"
+msgstr "<b>Tilgængeligt indhold</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "Status"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+#, fuzzy
+msgid "resume"
+msgstr "_Genoptag"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+#, fuzzy
+msgid "Terminate a conversation."
+msgstr "_Avanceret konfiguration"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Type"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "Navn"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr "Værdi"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+#, fuzzy
+msgid "Public?"
+msgstr "Udgi_v"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<n>Udgivelser</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Kørende programmer</b>"
+
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 #, fuzzy
 msgid "_recursive"
 msgstr "r_ekursivt"
 
 # Det plejer at være _Generelt (måske navnet på en menu)
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "_Generelt"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "_Navnerum"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 #, fuzzy
 msgid "_Publication type:"
 msgstr "_Udgivelse"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 #, fuzzy
 msgid "Select file"
 msgstr "Vælg alle filer"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 #, fuzzy
 msgid "Preview:"
 msgstr "_Forhåndsvisning:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "_Nøgleord:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 #, fuzzy
 msgid "_Index file:"
 msgstr "_Identifikation:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 #, fuzzy
 msgid "_Root keyword:"
 msgstr "_Nøgleord:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 #, fuzzy
 msgid "A_nonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 #, fuzzy
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 #, fuzzy
 msgid "_Replication:"
 msgstr "Program"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 #, fuzzy
 msgid "Publication options:"
 msgstr "_Udgivelse"
@@ -1120,130 +1577,274 @@ msgstr "_Udgivelse"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Indtast metadata (beskrivelser) for dette navnerum"
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Navn"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
+#, fuzzy
+msgid "Normal"
+msgstr "Format"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+msgid "PDF documents"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:371
+#, fuzzy
+msgid "Copy selection"
+msgstr "_Samling"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 #, fuzzy
 msgid "gnunet-fs-gtk"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
+#: contrib/gnunet_fs_gtk_main_window.glade:438
 msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 #, fuzzy
 msgid "_File sharing"
 msgstr "Filde_ling"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
+#: contrib/gnunet_fs_gtk_main_window.glade:483
 #, fuzzy
 msgid "_Publish"
 msgstr "Udgi_v"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
+#: contrib/gnunet_fs_gtk_main_window.glade:486
 #, fuzzy
 msgid "Publish files or directories on GNUnet"
 msgstr "Udgiv en fil til GNUnet"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 #, fuzzy
 msgid "_List indexed files"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
+#: contrib/gnunet_fs_gtk_main_window.glade:515
 msgid "Download a file or directory with a known URI."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
+#: contrib/gnunet_fs_gtk_main_window.glade:526
 #, fuzzy
 msgid "_Open GNUnet directory"
 msgstr "Åbn en GNUnet-mappe fra en fil"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_fs_gtk_main_window.glade:529
 msgid ""
 "Use this option to browse a GNUnet directory file that has been previously "
 "downloaded."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_fs_gtk_main_window.glade:549
 msgid ""
 "Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
+#: contrib/gnunet_fs_gtk_main_window.glade:564
 #, fuzzy
 msgid "_Edit"
 msgstr "_Afslut"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
+#: contrib/gnunet_fs_gtk_main_window.glade:575
 #, fuzzy
 msgid "Edit the system configuration."
 msgstr "Start konfigurationsgu_iden"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:275
+#: contrib/gnunet_fs_gtk_main_window.glade:599
 msgid "Show meta data in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
+#: contrib/gnunet_fs_gtk_main_window.glade:600
 #, fuzzy
 msgid "Metadata"
 msgstr "Metadata"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
+#: contrib/gnunet_fs_gtk_main_window.glade:610
 msgid "Show preview (when available)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
+#: contrib/gnunet_fs_gtk_main_window.glade:611
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
+#: contrib/gnunet_fs_gtk_main_window.glade:621
 msgid "Show search box in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
 #, fuzzy
 msgid "Search"
 msgstr "S_øg"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:323
+#: contrib/gnunet_fs_gtk_main_window.glade:647
 msgid "Display information about this version of gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:354
+#: contrib/gnunet_fs_gtk_main_window.glade:679
 #, fuzzy
 msgid "Namespace:"
 msgstr "_Navnerum"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:395
+#: contrib/gnunet_fs_gtk_main_window.glade:725
 msgid ""
 "Remember the specified namespace for later.\n"
 "This operation will be executed using the anonymity level specified on the "
 "right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:415
+#: contrib/gnunet_fs_gtk_main_window.glade:746
 #, fuzzy
 msgid "Keywords:"
 msgstr "Nøgleord"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:459
+#: contrib/gnunet_fs_gtk_main_window.glade:787
 msgid ""
 "Search using the given keywords.  The search may be narrowed by the given "
 "mime type and/or restricted to a namespace.\n"
@@ -1251,229 +1852,74 @@ msgid ""
 "right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
 #, fuzzy
 msgid "Anonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:538
+#: contrib/gnunet_fs_gtk_main_window.glade:867
 #, fuzzy
 msgid "Mime-type:"
 msgstr "Mime-type"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
 #: contrib/gnunet_fs_gtk_search_tab.glade:104
 msgid "Status"
 msgstr "Status"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:848
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
 #, fuzzy
 msgid "Download into:"
 msgstr "H_ent"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:862
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
 msgid "Select a directory to download into"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:888
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
 #, fuzzy
 msgid "Download as:"
 msgstr "H_ent"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:991
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
 #, fuzzy
 msgid "Recursive"
 msgstr "r_ekursivt"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
 #, fuzzy
 msgid "Download!"
 msgstr "H_ent"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
 msgid "Thumbnail associated with the currently selected content"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
 #, fuzzy
 msgid "File meta data"
 msgstr "Vis metadata"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
-#, fuzzy
-msgid "Normal"
-msgstr "Format"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-msgid "PDF documents"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
-#, fuzzy
-msgid "Copy selection"
-msgstr "_Samling"
-
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 msgid "Enter the URI to be downloaded"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 #, fuzzy
 msgid "_URI:"
 msgstr "URI"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 #, fuzzy
 msgid "<b>Messages</b>"
 msgstr "<b>Metadata</b>"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr ""
 
@@ -1481,46 +1927,46 @@ msgstr ""
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 #, fuzzy
 msgid "Publish content on GNUnet"
 msgstr "Udgiv en fil til GNUnet"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 #, fuzzy
 msgid "_Create empty directory"
 msgstr "Åbn en GNUnet-mappe fra en fil"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 #, fuzzy
 msgid "Add _Directory"
 msgstr "Mappe"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1528,11 +1974,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1551,18 +1997,18 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 msgid "Identifier:"
 msgstr "Identifikation:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1571,35 +2017,35 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "Næste identifikation"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 msgid "Identifier"
 msgstr "Identifikation"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "Næste identifikation"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 msgid "Make publication updateable"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1607,18 +2053,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "Næste identifikation"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1626,15 +2072,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 msgid ""
 "This button removes all keywords from all files and directories in this "
 "dialog.\n"
@@ -1645,51 +2091,78 @@ msgid ""
 "Note that meta data is unaffected when using this function."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 #, fuzzy
 msgid "_Cancel"
 msgstr "A_vanceret"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
 #, fuzzy
-msgid "Priority:"
-msgstr "_Prioritet:"
+msgid "Select directory to publish"
+msgstr "Vælg mappen du ønsker at udgive."
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritet:"
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 #, fuzzy
 msgid "Index files"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Publish file..."
 msgstr "Udgivet filnavn"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 #, fuzzy
 msgid "Index file"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 #, fuzzy
 msgid "Progress"
 msgstr "Fremgang"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 #, fuzzy
 msgid "Publishing"
 msgstr "Udgi_v"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1698,49 +2171,54 @@ msgstr ""
 msgid "Indexed files"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "Inde_ks"
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 #, fuzzy
 msgid "gnunet-gtk"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "_Statistik"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "Filde_ling"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+#, fuzzy
+msgid "Voice conversation"
+msgstr "_Avanceret konfiguration"
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "_Avanceret konfiguration"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 #, fuzzy
 msgid "Quit"
 msgstr "_Afslut"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1748,231 +2226,236 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "<b>Metadata</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 #, fuzzy
 msgid "Type:"
 msgstr "_Type:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "_Værdi:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Type"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
-msgstr "Værdi"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 #, fuzzy
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr "Metadata der beskriver navnerummet (anvendt i reklamer)"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "Navn"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Kørende programmer</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 msgid "Execute advertisement."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Filnavn"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "Næste identifikation"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
 "change it later (based on the selected expiration values)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 #, fuzzy
 msgid "<b>Name</b>"
 msgstr "<b>Metadata</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
 msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
 msgid "Record is public (visible to other users)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:285
 #: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
 msgid "Record is a shadow record (valid after other records expire)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
 msgid ""
 "A shadow record is a record which becomes valid in the future.  They are not "
 "used as long as a second non-expired record with the same name and type "
@@ -1983,52 +2466,61 @@ msgid ""
 "becomes valid at midnight."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "<b>Kørende programmer</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
 msgid "Relative"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
 msgid ""
 "Records with a relative expiration time (such as 1 week) are always valid "
 "for at least that time period into the future. In other words, the auto-"
@@ -2039,265 +2531,505 @@ msgid ""
 "entries for which you do not know a specific date when they will expire."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
-msgid "Absolute"
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
+msgid ""
+"Records with an absolute expiration time are valid until the specified date. "
+"You can change that date to an even later date, but you cannot set it to an "
+"earlier time (as other users may have cached the longer expiration time). "
+"Use absolute expiration times if you know that a particular record will only "
+"be valid until a particular day."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
+msgid ""
+"Records can be set to be valid forever. This is great if you are worried "
+"about censorship or certain that the mapping will never change.  Note that "
+"if you set a public record to never expire, you cannot later change it (as "
+"other users are free to cache the old value forever)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
+msgid ""
+"Select the date on which you want this record to expire. At that date, you "
+"can then create a new mapping or have a shadow record go automatically into "
+"effect.  Note that for public records you cannot change the expiration time "
+"to an earlier date after the fact."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
+#, fuzzy
+msgid "Minutes:"
+msgstr "minutter"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
+#, fuzzy
+msgid "Seconds:"
+msgstr "sekunder"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
+msgid ""
+"Relative expiration time of the record.  The syntax is a number followed by "
+"a space and a time unit, possibly followed by additional numbers and time "
+"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
+"drop-down menu to select from a set of common defaults. (Editing is not "
+"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<n>Udgivelser</b>"
+
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
+msgid ""
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+msgid "_Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+#, fuzzy
+msgid "<b>Service record (SRV)</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
-msgid ""
-"Records with an absolute expiration time are valid until the specified date. "
-"You can change that date to an even later date, but you cannot set it to an "
-"earlier time (as other users may have cached the longer expiration time). "
-"Use absolute expiration times if you know that a particular record will only "
-"be valid until a particular day."
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
-msgid "Never"
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
-msgid ""
-"Records can be set to be valid forever. This is great if you are worried "
-"about censorship or certain that the mapping will never change.  Note that "
-"if you set a public record to never expire, you cannot later change it (as "
-"other users are free to cache the old value forever)."
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
-msgid ""
-"Select the date on which you want this record to expire. At that date, you "
-"can then create a new mapping or have a shadow record go automatically into "
-"effect.  Note that for public records you cannot change the expiration time "
-"to an earlier date after the fact."
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
+#, fuzzy
+msgid "Selector:"
+msgstr "Vælg forhåndsvisning"
+
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
-msgid "Hours:"
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
-msgid "Which hour of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
-#, fuzzy
-msgid "Minutes:"
-msgstr "minutter"
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
-msgid "Which minute of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
 #, fuzzy
-msgid "Seconds:"
-msgstr "sekunder"
+msgid "Certificate:"
+msgstr "Identifikation:"
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
-msgid "Which second of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_box.glade:821
 msgid ""
-"Relative expiration time of the record.  The syntax is a number followed by "
-"a space and a time unit, possibly followed by additional numbers and time "
-"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
-"drop-down menu to select from a set of common defaults. (Editing is not "
-"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
 #, fuzzy
-msgid "<b>Expiration Time</b>"
-msgstr "<n>Udgivelser</b>"
+msgid "<b>TLSA Record Information</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:329
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "<b>Metadata</b>"
+
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2307,35 +3039,35 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr ""
 
@@ -2343,204 +3075,231 @@ msgstr ""
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "_Modparter"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 msgid "Enter the phone line used for the user at the peer here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Nøgleord</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 msgid "Enter the public key of the authority here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-#, fuzzy
-msgid "<b>Service record (SRV)</b>"
-msgstr "<n>GNUnet dæmonkonfiguration</b>"
-
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 #, fuzzy
 msgid "Peer:"
 msgstr "_Modparter"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+#, fuzzy
+msgid "Edit"
+msgstr "_Afslut"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
-msgid "Preferred zone name (NICK):"
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
+#, fuzzy
+msgid " _Select Zone"
+msgstr "Vælg alle filer"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 #, fuzzy
 msgid "QR code for the selected zone"
 msgstr "Luk den valgte søgning"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+msgid "  _Edit Zone "
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-#, fuzzy
-msgid "Edit"
-msgstr "_Afslut"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 #, fuzzy
@@ -3168,112 +3927,116 @@ msgstr ""
 "Daniel Nylander <address@hidden>\n"
 "Joe Hansen <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 #, fuzzy
 msgid "Address valid?"
 msgstr "Adresse"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-peerinfo-gtk"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 #, fuzzy
 msgid "Friend"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "Status"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-setup"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
 "use."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Filde_ling"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+msgid "VPN"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:495
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3284,446 +4047,469 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
 "\".gnunet\" TLD."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 #, fuzzy
 msgid "F_2F only"
 msgstr "K_un fil"
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:393
+# Det plejer at være _Generelt (måske navnet på en menu)
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "_Generelt"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-# Det plejer at være _Generelt (måske navnet på en menu)
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "_Generelt"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:733
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
 #, fuzzy
-msgid "<b>Bandwidth Configuration</b>"
-msgstr "<n>GNUnet dæmonkonfiguration</b>"
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr ""
+msgid "_Proxy type:"
+msgstr "_Udgivelse"
 
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:783
-#, fuzzy
-msgid "Attempt automatic configuration"
-msgstr "Start konfigurationsgu_iden"
-
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "_Filnavn:"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+msgid "Proxy password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1248
+msgid "_Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1294
+msgid "Max. upload bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1018
+#: contrib/gnunet_setup_main_window.glade:1343
 #, fuzzy
-msgid "<b>NAT Traversal Configuration</b>"
+msgid "<b>Bandwidth Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 #, fuzzy
 msgid "Test configuration"
 msgstr "_Avanceret konfiguration"
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
 "can only work if you are not running your peer at the time you run the test."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+msgid "HTTP-Server"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2424
+msgid "HTTP-Client"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2625
+msgid "HTTPS-Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2891
+msgid "HTTPS-Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Kørende programmer</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 #, fuzzy
 msgid "Postgres"
 msgstr "Fremgang"
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 #, fuzzy
 msgid "gnunet"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 #, fuzzy
 msgid "Configuration file:"
 msgstr "_Konfigurationsfil anvendt for gnunetd:"
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 #, fuzzy
 msgid "Username:"
 msgstr "_Filnavn:"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 #, fuzzy
 msgid "Configuration:"
 msgstr "_Avanceret konfiguration"
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Filde_ling"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4184
+#, fuzzy
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3731,11 +4517,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3743,12 +4529,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Indgående trafik"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3759,173 +4545,138 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3486
-#, fuzzy
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<n>GNUnet dæmonkonfiguration</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+msgid "_VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
 "support before enabling this option."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
 "192.168.0.1/255.255.0.0).  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<n>Udgivelser</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "Identifikation"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 msgid "_Port"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "Beskrivelse"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 #, fuzzy
 msgid "GNS & N_amestore"
 msgstr "_Navnerum"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
@@ -3934,12 +4685,12 @@ msgstr ""
 msgid "About gnunet-statistics-gtk"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 #, fuzzy
 msgid "gnunet-statistics-gtk"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr ""
 
@@ -3948,15 +4699,35 @@ msgstr ""
 msgid "_Connections"
 msgstr "Tilslutning"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 #, fuzzy
 msgid "_Traffic"
 msgstr "Indgående trafik"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr ""
 
+#, fuzzy
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<n>Udgivelser</b>"
+
+#, fuzzy
+#~ msgid "Attempting fully-automatic, non-interactive network configuration\n"
+#~ msgstr "Start konfigurationsgu_iden"
+
+#, fuzzy
+#~ msgid "attempt automatic configuration of the network and instantly exit"
+#~ msgstr "Start konfigurationsgu_iden"
+
+#, fuzzy
+#~ msgid "Attempt automatic configuration"
+#~ msgstr "Start konfigurationsgu_iden"
+
+#, fuzzy
+#~ msgid "<b>NAT Traversal Configuration</b>"
+#~ msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
 #~ msgid "Internal error"
 #~ msgstr "Intern fejl"
 
@@ -4011,10 +4782,6 @@ msgstr ""
 #~ msgid "_Options"
 #~ msgstr "Ope_rationer"
 
-#, fuzzy
-#~ msgid "<b>Domain Owner Information</b>"
-#~ msgstr "<n>GNUnet dæmonkonfiguration</b>"
-
 #~ msgid "Country"
 #~ msgstr "Land"
 
@@ -4108,9 +4875,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "GNU's modpartsnetværk"
 
-#~ msgid "Identity"
-#~ msgstr "Identitet"
-
 #~ msgid "anonymous"
 #~ msgstr "anonym"
 
@@ -4126,9 +4890,6 @@ msgstr ""
 #~ msgid "Choose the file you want to publish."
 #~ msgstr "Vælg filen du ønsker at udgive."
 
-#~ msgid "Choose the directory you want to publish."
-#~ msgstr "Vælg mappen du ønsker at udgive."
-
 #~ msgid "Title"
 #~ msgstr "Titel"
 
@@ -4235,9 +4996,6 @@ msgstr ""
 #~ msgid "Should the namespace `%s' really be deleted?"
 #~ msgstr "Skal navnerummet »%s« virkelig slettes?"
 
-#~ msgid "Downloading `%s'\n"
-#~ msgstr "Henter »%s«\n"
-
 #~ msgid "ERROR: already downloading `%s'"
 #~ msgstr "Fejl: Henter allerede »%s«"
 
@@ -4281,9 +5039,6 @@ msgstr ""
 #~ msgid "GNUnet - Connected to %Lu peers"
 #~ msgstr "GNUnet - forbundet til %Lu modparter"
 
-#~ msgid "<b>Disconnected</b>"
-#~ msgstr "<b>Afbrudt</b>"
-
 #~ msgid "GNUnet - Disconnected"
 #~ msgstr "GNUnet - afbrudt"
 
@@ -4657,9 +5412,6 @@ msgstr ""
 #~ msgid "end collection (will not delete content already in the collection)"
 #~ msgstr "afslut samling (vil ikke slette indhold allerede i samlingen)"
 
-#~ msgid "<b>Available content</b>"
-#~ msgstr "<b>Tilgængeligt indhold</b>"
-
 #~ msgid ""
 #~ "Should GNUnet track available content (for publishing in namespaces)?"
 #~ msgstr "Bør GNUnet spore tilgængeligt indhold (for udgivelse i navnerum)?"
@@ -4682,9 +5434,6 @@ msgstr ""
 #~ msgid "Cha_t"
 #~ msgstr "S_nak"
 
-#~ msgid "_Logs"
-#~ msgstr "_Logfiler"
-
 #~ msgid "Edit File Information"
 #~ msgstr "Rediger filinformation"
 
@@ -4750,9 +5499,6 @@ msgstr ""
 #~ msgid "Lists all of the keywords that will be used."
 #~ msgstr "Vis alle de nøgleord som vil blive brugt."
 
-#~ msgid "Select Preview"
-#~ msgstr "Vælg forhåndsvisning"
-
 #~ msgid "Cancel the publication."
 #~ msgstr "Afbryd udgivelsen."
 
@@ -4820,9 +5566,6 @@ msgstr ""
 #~ msgid "Resume the search"
 #~ msgstr "Genoptag søgningen"
 
-#~ msgid "_Resume"
-#~ msgstr "_Genoptag"
-
 #~ msgid "Close search tab (also aborts search)"
 #~ msgstr "Luk søgefanebald (afbryder også søgning)"
 
diff --git a/po/de.po b/po/de.po
index dbc97688..7fec256a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.9.5\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2014-03-07 16:59+0100\n"
 "Last-Translator: Mario Blättermann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -20,30 +20,183 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Einen Typ auswählen"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ungültige URI: `%s'"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "Ungültige URI: `%s'"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+#, fuzzy
+msgid "Error communicating with namestore!\n"
+msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, fuzzy, c-format
+msgid "Adding contact failed: %s\n"
+msgstr "Binde Konfigurationsdatei `%s' ein\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, fuzzy, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr "Format der Datei `%s' ist ungültig.\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, fuzzy, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr "VPN-Datensatz-Zeichenkette »%s« konnte nicht verarbeitet werden\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "Datensatz konnte nicht entfernt werden"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "Datensatz konnte nicht entfernt werden"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+msgid "connected"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+#, fuzzy
+msgid "Failed to setup phone (internal error)"
+msgstr "Fehler beim Parsen des angegebenen Zeitintervalls."
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, fuzzy, c-format
+msgid "In a conversation with `%s'."
+msgstr "Binde Konfigurationsdatei `%s' ein\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, fuzzy, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr "Binde Konfigurationsdatei `%s' ein\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, fuzzy, c-format
+msgid "Resolving `%s'."
+msgstr "Downloading `%s'"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, fuzzy, c-format
+msgid "Calling `%s'."
+msgstr "Lade `%s' hoch."
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+#, fuzzy
+msgid "No phone line specified in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr "im Benachrichtigungsfeld minimiert starten"
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -53,12 +206,12 @@ msgstr ""
 "Überprüfung der als UTF-8 angenommenen Zeichenkette »%s« der Länge »%u« war "
 "nicht möglich, sie wird als C-Zeichenkette angenommen\n"
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr "Ausgewählte Datei »%s« ist kein GNUnet-Verzeichnis!\n"
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 msgid "no description supplied"
 msgstr "Keine Beschreibung angegeben"
 
@@ -67,103 +220,103 @@ msgstr "Keine Beschreibung angegeben"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "»%s« konnte nicht geladen werden: %s\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 msgid "_Download"
 msgstr "Downl_oad"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 msgid "Download _recursively"
 msgstr "_Rekursiv herunterladen"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 msgid "Download _as..."
 msgstr "Herunterladen _als …"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 msgid "_Abort download"
 msgstr "Download _abbrechen"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr "URI in die _Zwischenablage kopieren"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr "Fehler!"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 msgid "no URI"
 msgstr "keine URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 msgid "_Abort publishing"
 msgstr "Veröffentlichung _abbrechen"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr "Fehler beim Erzeugen der Namespace URI von `%s'.\n"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr "Ungültige Schlüsselwort-Zeichenkette »%s«: %s"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "Datensatz konnte nicht entfernt werden"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Verzeichnis »%s« wird eingelesen.\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr "Fehler beim Einlesen von »%s« (Zugriffsfehler), wird übersprungen.\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, c-format
 msgid "Processed file `%s'.\n"
 msgstr "Datei »%s« wird verarbeitet.\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr "Vorgang fehlgeschlagen (Abbrechen anklicken)\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr "Einlesen ist abgeschlossen.\n"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 msgid "Select a type"
 msgstr "Einen Typ auswählen"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr "Geben Sie einen Wert ein"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "Vorschau »%s« konnte nicht in den Speicher geladen werden\n"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
@@ -172,85 +325,86 @@ msgstr "<unbenannt>"
 msgid "Could not access indexed file `%s'\n"
 msgstr "Auf die indizierte Datei »%s« konnte nicht zugegriffen werden\n"
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Bereitgestellter Port:"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "»%s« konnte nicht geladen werden: %s\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Bereitgestellter Port:"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, c-format
 msgid "Failed to load animation from file `%s'\n"
 msgstr "Animation konnte nicht aus Datei »%s« geladen werden\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/lib/glade.c:123
-#, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "»%s« konnte nicht geladen werden: %s\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
+msgstr "Widget »%s« konnte nicht initialisiert werden\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
-"Der Installationspfad für %s konnte nicht ermittelt werden. Setzen Sie die "
-"Umgebungsvariable »%s«.\n"
 
-#: src/main/gnunet-gtk.c:220
+#: src/lib/glade.c:133
 #, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+msgid "Failed to load `%s': %s\n"
+msgstr "»%s« konnte nicht geladen werden: %s\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+#, fuzzy
+msgid "<new zone>"
 msgstr "<neuer Name>"
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr "<neuer Name>"
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr "<neuer Datensatz>"
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr "nie"
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr "ungültig"
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr "QR-Code-Pixbuf konnte nicht initialisiert werden"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 msgid "Failed to initialize QR-code pixbuf"
 msgstr "QR-Code-Pixbuf konnte nicht initialisiert werden"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, fuzzy, c-format
 msgid "Operation failed: `%s'\n"
 msgstr "Vorgang fehlgeschlagen (Abbrechen anklicken)\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
@@ -259,32 +413,41 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+#, fuzzy
+msgid "Failed to communicate with database"
+msgstr "Datensatz konnte nicht in die Datenbank eingefügt werden"
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "Fehler beim Öffnen von `%s'\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr "Animation konnte nicht aus Datei »%s« geladen werden\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr "Animation konnte nicht aus Datei »%s« geladen werden\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -292,48 +455,69 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr "Nicht unterstützter Datensatztyp"
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, fuzzy, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr "Name »%s« ungültig für GADS/DNS (zu lang für ein DNS-Label?)\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
-#, fuzzy, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
-msgstr "Name »%s« ungültig für GADS/DNS (zu lang für ein DNS-Label?)\n"
-
-#: src/namestore/gnunet-namestore-gtk.c:2258
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
 msgid "Got invalid record name `%s' from namestore\n"
 msgstr "Ungültigen Datensatznamen »%s« aus dem Namensspeicher erhalten\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Zone %s bearbeiten</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:2696
+#, fuzzy
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
+"Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion '%s' "
+"unter `%s' definiert.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+#, fuzzy
+msgid "Creating zone"
+msgstr "E_rzeugen"
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr "<b><big>Keine Verbindung zum Namensspeicher möglich</b></big>"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "MX-Datensatz »%s« konnte nicht verarbeitet werden\n"
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -349,16 +533,137 @@ msgstr "MX-Datensatz »%s« konnte nicht verarbeitet 
werden\n"
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "SOA-Datensatz »%s« konnte nicht verarbeitet werden\n"
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "SOA-Datensatz »%s« konnte nicht verarbeitet werden\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr "SOA-Datensatz »%s« konnte nicht verarbeitet werden\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "Widget »%s« konnte nicht initialisiert werden\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "»%s« konnte nicht geladen werden: %s\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "Widget »%s« konnte nicht initialisiert werden\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "»%s« konnte nicht geladen werden: %s\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+#, fuzzy
+msgid "Name resolution failed\n"
+msgstr "Vorgang fehlgeschlagen (Abbrechen anklicken)\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, fuzzy, c-format
+msgid "Unsupported address family %d\n"
+msgstr "Nicht unterstützter Datensatztyp"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "»%s« konnte nicht geladen werden: %s\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "Widget »%s« konnte nicht initialisiert werden\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, fuzzy, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr "`%s' %s schlug fehl: %s\n"
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "VPN-Datensatz-Zeichenkette »%s« konnte nicht verarbeitet werden\n"
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "Datensatz konnte nicht erzeugt werden"
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr "Widget `%s' nicht gefunden\n"
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr "Ungültiger regulärer Ausdruck »%s«\n"
+
+#: src/setup/gnunet-setup.c:209
+#, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr "Optionswert aus Widget »%s« konnte nicht erhalten werden\n"
+
+#: src/setup/gnunet-setup.c:271
+#, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Widget »%s« konnte nicht initialisiert werden\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr "Kein Vorgabewert für Option »%s« im Abschnitt »%s«\n"
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr "Widget »%s« mit Wert »%s« konnte nicht initialisiert werden\n"
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+"Geben Sie IHR Passwort ein, um gnunet-setup als Benutzer »gnunet« "
+"auszuführen (sofern »sudo« es erlaubt)"
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "Info zu gnunet-peerinfo-gtk"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+"als Benutzer »gnunet« ausführen, wenn nötig »gksu« aufrufen, um die Rechte "
+"zu erhalten"
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -392,301 +697,324 @@ msgstr ""
 "Es konnte nicht ermittelt werden, ob der Rechnerlisten-Daemon über einen "
 "integrierten Rechnerlisten-Server verfügt.\n"
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr "der Rechnerlisten-Server"
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr "das TCP-Transport-Plugin"
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr "das HTTP-Transport-Plugin"
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr "das HTTPS-Transport-Plugin"
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr "Widget `%s' nicht gefunden\n"
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr "Angegebenes Widget »%s« ist kein Auswahlknopf\n"
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr "Angegebenes Widget »%s« ist kein Einstellknopf\n"
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr "Dieser Port ist bereits von %s belegt."
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr "Soll GNUnet ausschließlich mit Freunden verbinden?"
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr "Minimale Anzahl an Verbindungen zu Freunden"
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr "Topologie sollte immer geladen werden"
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 "Soll die Rechnerlisten-Unterstützung automatisch beim Programmstart "
 "gestartet werden?"
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 "Soll der Datenaustausch automatisch beim Programmstart gestartet werden?"
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr "Soll GNUnet aus Rechnerlisten anderer Knoten lernen?"
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr "Soll GNUnet aus Rechnerlisten anderer Knoten lernen?"
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr "Soll dieser Knoten anderen Knoten eine Rechnerliste anbieten?"
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr "Soll dieser Knoten seine Rechnerliste für andere Knoten bereitstellen?"
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr "Port, an dem diese Knoten-Rechnerliste angeboten werden soll"
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr "URLs für Liste der bekannten Rechner"
 
-#: src/setup/gnunet-setup-options.c:1255
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1483
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr "Wie viele Bytes pro Sekunde dürfen übertragen werden?"
 
-#: src/setup/gnunet-setup-options.c:1267
+#: src/setup/gnunet-setup-options.c:1495
 msgid "How many bytes per second are we allowed to receive?"
 msgstr "Wie viele Bytes pro Sekunde dürfen empfangen werden?"
 
-#: src/setup/gnunet-setup-options.c:1281
+#: src/setup/gnunet-setup-options.c:1509
 msgid "Enable communication via TCP"
 msgstr "TCP-Kommunikation aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1293
+#: src/setup/gnunet-setup-options.c:1521
 msgid "Enable communication via UDP"
 msgstr "UDP-Kommunikation aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1305
+#: src/setup/gnunet-setup-options.c:1533
 msgid "Enable communication via HTTP as a server"
 msgstr "HTTP-Kommunikation als Server aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1317
+#: src/setup/gnunet-setup-options.c:1545
 msgid "Enable communication via HTTP as a client"
 msgstr "HTTP-Kommunikation als Client aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1329
+#: src/setup/gnunet-setup-options.c:1557
 msgid "Enable communication via HTTPS as a server"
 msgstr "HTTPS-Kommunikation als Server aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1341
+#: src/setup/gnunet-setup-options.c:1569
 msgid "Enable communication via HTTPS as a client"
 msgstr "HTTPS-Kommunikation als Client aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1353
+#: src/setup/gnunet-setup-options.c:1581
 msgid "Enable communication via DV"
 msgstr "DV-Kommunikation aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1365
+#: src/setup/gnunet-setup-options.c:1593
 msgid "Enable communication via WLAN"
 msgstr "Kommunikation über WLAN aktivieren"
 
-#: src/setup/gnunet-setup-options.c:1377
+#: src/setup/gnunet-setup-options.c:1605
 msgid "Port we bind to for TCP"
 msgstr "Port zur Bindung an TCP"
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
 msgid "Port visible to other peers"
 msgstr "Port sichtbar für andere Knoten"
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
-msgstr "Überprüfen, ob sich der Knoten hinter einem NAT befindet"
-
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
-msgstr ""
-"Überprüfen, ob NAT manuell für die Port-Weiterleitung eingerichtet wurde"
-
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
-msgstr "NAT-Traversal mit UPnP/PMP aktivieren"
-
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
-msgstr "NAT-Traversal mit ICMP als Server aktivieren"
-
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
-msgstr "Externe (öffentliche) IP-Adresse des NAT"
-
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
-msgstr "NAT-Traversal mit ICMP als Client aktivieren"
-
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
-msgstr "Interne (private) IP-Adresse des NAT"
-
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
-msgstr "IPv6-Unterstützung deaktivieren"
-
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr "Port für eingehende UDP-Pakete, 0 verwenden, falls hinter NAT"
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr "Port für eingehende HTTP-Verbindungen, 0 verwenden, falls hinter NAT"
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr "Port für eingehende HTTPS-Verbindungen, 0 verwenden, falls hinter NAT"
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr "Wie viele Bytes dürfen im lokalen Datenspeicher gespeichert werden?"
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr "sqLite zum Speichern ausgetauschter Inhalte verwenden"
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr "MySQL zum Speichern ausgetauschter Inhalte verwenden"
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr "Postgres zum Speichern ausgetauschter Inhalte verwenden"
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr "Name der MySQL-Datenbank"
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 msgid "Configuration file for MySQL access"
 msgstr "Konfigurationsdatei für MySQL-Zugriff"
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr "Benutzername für MySQL-Zugriff"
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr "Passwort für MySQL-Zugriff"
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr "Name des Rechners, auf dem die MySQL-Datenbank läuft"
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr "Port der MySQL-Datenbank"
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "Konfiguration für Postgres (übergeben an PQconnectdb)"
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr "Soll versucht werden, Inhalte an andere Knoten zu pushen?"
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 "Ist es erlaubt, von anderen Knoten erhaltene Inhalte zwischenzuspeichern?"
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr "Wie viele Bytes können im lokalen Zwischenspeicher gespeichert werden?"
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr "sqLite zum Zwischenspeichern der DHT-Daten verwenden"
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr "Speicher zum Zwischenspeichern der DHT-Daten verwenden"
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr "Postgres zum Zwischenspeichern der DHT-Daten verwenden"
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr "Name der zu verwendenden Überwachungsschnittstelle (monX)"
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+#, fuzzy
+msgid "Should the VPN be started automatically on startup?"
+msgstr "Soll VPN/PT automatisch beim Programmstart gestartet werden?"
+
+#: src/setup/gnunet-setup-options.c:2180
+#, fuzzy
+msgid "Should the PT be started automatically on startup?"
 msgstr "Soll VPN/PT automatisch beim Programmstart gestartet werden?"
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr "IPv4-Netzwerkverkehr über GNUnet tunneln"
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr "IPv6-Netzwerkverkehr über GNUnet tunneln"
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr "DNS-Netzwerkverkehr über GNUnet tunneln"
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr "Name der virtuellen Schnittstelle, die GNUnet VPN erstellen soll"
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr "Für die VPN-Schnittstelle zu verwendende IPv4-Adresse"
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr "Für die VPN-Schnittstelle zu verwendende IPv4-Netzmaske"
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr "Für die VPN-Schnittstelle zu verwendende IPv6-Adresse"
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 "Länge des IPv6-Netzwerk-Präfixes, das für die VPN-Schnittstelle verwendet "
 "werden soll"
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
@@ -694,7 +1022,7 @@ msgstr ""
 "VPN-Exit aktivieren, um Dienste bereitzustellen und/oder anderen zu "
 "erlauben, Ihre Internetverbindung zu nutzen"
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
@@ -702,14 +1030,14 @@ msgstr ""
 "IP-Adresse der zu verwendenden externen DNS-Namensauflösung (Werte aus der "
 "resolv.conf sind üblicherweise anwendbar)"
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 "Anderen Knoten erlauben, DNS-Namensauflösungen über Ihre Internetverbindung "
 "auszuführen"
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
@@ -717,25 +1045,25 @@ msgstr ""
 "Name der virtuellen Schnittstelle, die der GNUnet-Exit-Dienst für den "
 "Verkehr vom VPN zum Internet erstellen soll"
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr "Für die Exit-Schnittstelle zu verwendende IPv4-Adresse"
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr "Für die Exit-Schnittstelle zu verwendende IPv4-Netzmaske"
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr "Für die Exit-Schnittstelle zu verwendende IPv6-Adresse"
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 "Länge des IPv6-Netzwerk-Präfixes, das für die Exit-Schnittstelle verwendet "
 "werden soll"
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
@@ -743,7 +1071,7 @@ msgstr ""
 "Anderen Knoten erlauben, UDP-Netzwerkverkehr über Ihre Internetverbindung "
 "laufen zu lassen (über die Exit-Schnittstelle)"
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
@@ -751,154 +1079,42 @@ msgstr ""
 "Anderen Knoten erlauben, TCP-Netzwerkverkehr über Ihre Internetverbindung "
 "laufen zu lassen (über die Exit-Schnittstelle)"
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr "sqLite zum Speichern von Namen verwenden"
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr "PostGres zum Speichern von Namen verwenden"
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr "Soll GNS automatisch beim Programmstart gestartet werden?"
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 #, fuzzy
 msgid "Specification of .gnunet hosted services"
 msgstr "Spezifikation der .gnunet-TLD"
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr "NAT-Traversal mit ICMP als Server erfolgreich aktiviert.\n"
+#: src/statistics/functions.c:519
+msgid "Connectivity"
+msgstr "Konnektivität"
 
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr "NAT-Traversal mit ICMP als Server fehlgeschlagen.\n"
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-"Zeitüberschreitung bei Einrichtung von NAT-Traversal mit ICMP als Server.\n"
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr "Verbindung wird umgekehrt mit ICMP-Server getestet.\n"
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr "Extern IP »%s« gefunden\n"
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-"Dieses System hat eine globale IPv6-Adresse, diese wird gesetzt, um IPv6 zu "
-"unterstützen.\n"
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr "Interne Netzwerkadresse »%s« erkannt.\n"
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr "upnpc gefunden, wird aktiviert\n"
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr "upnpc nicht gefunden\n"
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr "gnunet-helper-nat-server gefunden, wird getestet\n"
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr "Kein funktionierender gnunet-helper-nat-server gefunden\n"
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr "gnunet-helper-nat-client gefunden, wird aktiviert\n"
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-"gnunet-helper-nat-client nicht gefunden oder hinter NAT, wird deaktiviert\n"
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr "Ungültiger regulärer Ausdruck »%s«\n"
-
-#: src/setup/gnunet-setup.c:227
-#, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr "Optionswert aus Widget »%s« konnte nicht erhalten werden\n"
-
-#: src/setup/gnunet-setup.c:279
-#, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Widget »%s« konnte nicht initialisiert werden\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr "Kein Vorgabewert für Option »%s« im Abschnitt »%s«\n"
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr "Widget »%s« mit Wert »%s« konnte nicht initialisiert werden\n"
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-"Geben Sie IHR Passwort ein, um gnunet-setup als Benutzer »gnunet« "
-"auszuführen (sofern »sudo« es erlaubt)"
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "Info zu gnunet-peerinfo-gtk"
-
-#: src/setup/gnunet-setup.c:631
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr ""
-"Vollautomatische, nicht-interaktive Netzwerkkonfiguration wird versucht\n"
-
-#: src/setup/gnunet-setup.c:652
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr ""
-"automatische Netzwerkkonfiguration versuchen und dann unmittelbar beenden"
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-"als Benutzer »gnunet« ausführen, wenn nötig »gksu« aufrufen, um die Rechte "
-"zu erhalten"
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr "Konnektivität"
-
-#: src/statistics/functions.c:520
-msgid "# connected nodes (100% = connection table size)"
-msgstr "# verbundene Knoten (100% = Größe der Verbindungstabelle)"
+#: src/statistics/functions.c:520
+msgid "# connected nodes (100% = connection table size)"
+msgstr "# verbundene Knoten (100% = Größe der Verbindungstabelle)"
 
 #: src/statistics/functions.c:528
 msgid "System load"
@@ -952,7 +1168,7 @@ msgstr "Routing-Effektivität"
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr "Mittlere (rote) Effektivität (100% = perfekt)"
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr "Der Statistikdienst konnte nicht initialisiert werden.\n"
 
@@ -961,6 +1177,21 @@ msgstr "Der Statistikdienst konnte nicht initialisiert 
werden.\n"
 msgid "Connected to %Lu peers"
 msgstr "Mit %Lu Knoten verbunden"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+"Die Lizenz sollte hier zur Laufzeit aus der Lizenzdatei geladen werden, es "
+"sollte nicht notwendig sein, die vollständige GPL hierher zu kopieren …"
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -970,6 +1201,7 @@ msgstr "Mit %Lu Knoten verbunden"
 msgid "Developed by"
 msgstr "Entwickelt von"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -979,6 +1211,7 @@ msgstr "Entwickelt von"
 msgid "Documented by"
 msgstr "Dokumentation von"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -988,6 +1221,7 @@ msgstr "Dokumentation von"
 msgid "Translated by"
 msgstr "Übersetzung von"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -997,6 +1231,7 @@ msgstr "Übersetzung von"
 msgid "Artwork by"
 msgstr "Künstlerische Gestaltung von"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -1006,6 +1241,7 @@ msgstr "Künstlerische Gestaltung von"
 msgid "Credits"
 msgstr "Mitwirkende"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -1015,108 +1251,332 @@ msgstr "Mitwirkende"
 msgid "License"
 msgstr "Lizenz"
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Datei hinzu_fügen"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr "_Ansicht"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+#, fuzzy
+msgid "_Caller Identity"
+msgstr "_Identifizierer:"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+#, fuzzy
+msgid "<b>Caller Identity</b>"
+msgstr "<b>Verfügbare Inhalte</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "Status"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
 msgstr ""
-"Die Lizenz sollte hier zur Laufzeit aus der Lizenzdatei geladen werden, es "
-"sollte nicht notwendig sein, die vollständige GPL hierher zu kopieren …"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+msgid "resume"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<b>Dienstkonfiguration</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
+msgstr "Ziel:"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+#, fuzzy
+msgid "Terminate a conversation."
+msgstr "Konfiguration testen"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<b>GNUnet-Schnittstellenkonfiguration</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Typ"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "Name"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr "Wert"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+#, fuzzy
+msgid "Public?"
+msgstr "_Veröffentlichen"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+#, fuzzy
+msgid "Time"
+msgstr "Zeit:\n"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<b>Ablaufzeit</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Optionen</b>"
 
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr "Datei speichern unter …"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Anonymität:"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 msgid "_recursive"
 msgstr "_rekursiv"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "All_gemein"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "Namensraum:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 msgid "_Publication type:"
 msgstr "_Veröffentlichungstyp:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 msgid "Select file"
 msgstr "Datei auswählen"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 msgid "Preview:"
 msgstr "Vorschau:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "Schl_üsselwort:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 msgid "_Index file:"
 msgstr "_Index-Datei:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 msgid "_Root keyword:"
 msgstr "_Root-Schlüsselwort:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 msgid "A_nonymity:"
 msgstr "_Anonymität:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 msgid "_Priority:"
 msgstr "_Priorität:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr "_Ablaufjahr:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 msgid "_Replication:"
 msgstr "Wiede_rholung:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 msgid "Publication options:"
 msgstr "Veröffentlichungsoptionen:"
 
@@ -1125,45 +1585,200 @@ msgstr "Veröffentlichungsoptionen:"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Geben Sie die Meta-Daten (Beschreibungen) für diesen Namespace ein."
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "_Name:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
+#, fuzzy
+msgid "Normal"
+msgstr "Format"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+#, fuzzy
+msgid "PDF documents"
+msgstr "Dokumentation von"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:371
+msgid "Copy selection"
+msgstr "Auswahl kopieren"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 msgid "gnunet-fs-gtk"
 msgstr "gnunet-fs-gtk"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
+#: contrib/gnunet_fs_gtk_main_window.glade:438
 #, fuzzy
 msgid "Your peer is currently not connected."
 msgstr "# an verbundenen Knoten"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 msgid "_File sharing"
 msgstr "Datentausc_h"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
+#: contrib/gnunet_fs_gtk_main_window.glade:483
 msgid "_Publish"
 msgstr "_Veröffentlichen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
+#: contrib/gnunet_fs_gtk_main_window.glade:486
 msgid "Publish files or directories on GNUnet"
 msgstr "Dateien oder Verzeichnisse im GNUnet veröffentlichen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 msgid "_List indexed files"
 msgstr "Indizierte Dateien auf_listen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
+#: contrib/gnunet_fs_gtk_main_window.glade:515
 msgid "Download a file or directory with a known URI."
 msgstr "Eine Datei oder ein Verzeichnis mit einer bekannten URI herunterladen."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
+#: contrib/gnunet_fs_gtk_main_window.glade:526
 msgid "_Open GNUnet directory"
 msgstr "GNUnet-Verzeichnis ö_ffnen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_fs_gtk_main_window.glade:529
 msgid ""
 "Use this option to browse a GNUnet directory file that has been previously "
 "downloaded."
@@ -1171,301 +1786,135 @@ msgstr ""
 "Verwenden Sie diese Option, um eine GNUnet-Verzeichnisdatei zu durchsuchen, "
 "die vorher heruntergeladen wurde."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_fs_gtk_main_window.glade:549
 msgid ""
 "Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 "gnunet-fs-gtk beenden. Aktive Datenaustauschvorgänge werden nach dem "
 "erneuten Starten wiederaufgenommen."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
+#: contrib/gnunet_fs_gtk_main_window.glade:564
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
+#: contrib/gnunet_fs_gtk_main_window.glade:575
 msgid "Edit the system configuration."
 msgstr "Die Systemkonfiguration bearbeiten."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
-msgstr "_Ansicht"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:275
+#: contrib/gnunet_fs_gtk_main_window.glade:599
 msgid "Show meta data in main window"
 msgstr "Metadaten im Hauptfenster anzeigen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
+#: contrib/gnunet_fs_gtk_main_window.glade:600
 msgid "Metadata"
 msgstr "Metainformationen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
+#: contrib/gnunet_fs_gtk_main_window.glade:610
 msgid "Show preview (when available)"
 msgstr "Vorschau anzeigen (wenn verfügbar)"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
+#: contrib/gnunet_fs_gtk_main_window.glade:611
 msgid "Preview"
 msgstr "Vorschau"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
+#: contrib/gnunet_fs_gtk_main_window.glade:621
 msgid "Show search box in main window"
 msgstr "Suchfeld im Hauptfenster anzeigen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
 msgid "Search"
-msgstr "Suchen"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:323
-msgid "Display information about this version of gnunet-fs-gtk"
-msgstr "Informationen zu dieser Version von gnunet-fs-gtk anzeigen"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:354
-msgid "Namespace:"
-msgstr "Namensraum:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:395
-msgid ""
-"Remember the specified namespace for later.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right."
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:415
-#, fuzzy
-msgid "Keywords:"
-msgstr "Schlüsselbegriffe"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:459
-msgid ""
-"Search using the given keywords.  The search may be narrowed by the given "
-"mime type and/or restricted to a namespace.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right.\n"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
-msgid "Anonymity:"
-msgstr "Anonymität:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:538
-#, fuzzy
-msgid "Mime-type:"
-msgstr "Mimetyp"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
-#: contrib/gnunet_fs_gtk_search_tab.glade:104
-msgid "Status"
-msgstr "Status"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:848
-msgid "Download into:"
-msgstr "Herunterladen nach:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:862
-msgid "Select a directory to download into"
-msgstr "Ein Verzeichnis zum Herunterladen auswählen"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:888
-msgid "Download as:"
-msgstr "Herunterladen als:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:991
-msgid "Recursive"
-msgstr "Rekursiv"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
-msgid "Download!"
-msgstr "Herunterladen!"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
-msgid "Thumbnail associated with the currently selected content"
-msgstr "Vorschau, die dem aktuell ausgewählten Inhalt zugeordnet ist"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
-#, fuzzy
-msgid "File meta data"
-msgstr "Metainformationen"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
-#, fuzzy
-msgid "Normal"
-msgstr "Format"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-#, fuzzy
-msgid "PDF documents"
-msgstr "Dokumentation von"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
-msgstr ""
+msgstr "Suchen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:647
+msgid "Display information about this version of gnunet-fs-gtk"
+msgstr "Informationen zu dieser Version von gnunet-fs-gtk anzeigen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:679
+msgid "Namespace:"
+msgstr "Namensraum:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
+#: contrib/gnunet_fs_gtk_main_window.glade:725
+msgid ""
+"Remember the specified namespace for later.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:746
+#, fuzzy
+msgid "Keywords:"
+msgstr "Schlüsselbegriffe"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
+#: contrib/gnunet_fs_gtk_main_window.glade:787
+msgid ""
+"Search using the given keywords.  The search may be narrowed by the given "
+"mime type and/or restricted to a namespace.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
+msgid "Anonymity:"
+msgstr "Anonymität:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:867
+#, fuzzy
+msgid "Mime-type:"
+msgstr "Mimetyp"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
+#: contrib/gnunet_fs_gtk_search_tab.glade:104
+msgid "Status"
+msgstr "Status"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
+msgid "Download into:"
+msgstr "Herunterladen nach:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
+msgid "Select a directory to download into"
+msgstr "Ein Verzeichnis zum Herunterladen auswählen"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
+msgid "Download as:"
+msgstr "Herunterladen als:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
+msgid "Recursive"
+msgstr "Rekursiv"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
+msgid "Download!"
+msgstr "Herunterladen!"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
-msgid "Copy selection"
-msgstr "Auswahl kopieren"
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
+msgid "Thumbnail associated with the currently selected content"
+msgstr "Vorschau, die dem aktuell ausgewählten Inhalt zugeordnet ist"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
+#, fuzzy
+msgid "File meta data"
+msgstr "Metainformationen"
 
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 msgid "Enter the URI to be downloaded"
 msgstr "Herunterzuladende URI eingeben"
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 msgid "_URI:"
 msgstr "_URI:"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 msgid "<b>Messages</b>"
 msgstr "<b>Meldungen</b>"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr "Vorverarbeitung …"
 
@@ -1473,43 +1922,43 @@ msgstr "Vorverarbeitung …"
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 msgid "Publish content on GNUnet"
 msgstr "Inhalt im GNUnet veröffentlichen"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr "Datei hinzu_fügen"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 msgid "_Create empty directory"
 msgstr "_Leeres Verzeichnis erstellen"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 msgid "Add _Directory"
 msgstr "_Verzeichnis hinzufügen"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr "_Links"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr "_Rechts"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1517,11 +1966,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1540,18 +1989,18 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 msgid "Identifier:"
 msgstr "_Identifizierer:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1560,36 +2009,36 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "Bezeichner"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 msgid "Identifier"
 msgstr "Bezeichner"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "Bezeichner"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr "Beschreibung"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 #, fuzzy
 msgid "Make publication updateable"
 msgstr "Nächstes Veröffentlichungsdatum"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1597,18 +2046,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "_Identifizierer:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1616,15 +2065,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr "Ausführ_en"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr "Alle _Schlüsselwörter entfernen"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 #, fuzzy
 msgid ""
 "This button removes all keywords from all files and directories in this "
@@ -1643,44 +2092,71 @@ msgstr ""
 "eingeben. Beachten Sie, dass Metadaten durch Nutzung dieser Funktion nicht "
 "beeinflusst werden."
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
-msgid "Priority:"
-msgstr "Priorität:"
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
+#, fuzzy
+msgid "Select directory to publish"
+msgstr "Ein Verzeichnis zum Herunterladen auswählen"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr "Ablaufjahr:"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+msgid "Priority:"
+msgstr "Priorität:"
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 msgid "Index files"
 msgstr "Dateien indizieren"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 msgid "Publish file..."
 msgstr "Datei veröffentlichen …"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 msgid "Index file"
 msgstr "Datei indizieren"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 msgid "Publishing"
 msgstr "Veröffentlichung"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr "Das sollten Sie nicht sehen"
 
@@ -1688,48 +2164,53 @@ msgstr "Das sollten Sie nicht sehen"
 msgid "Indexed files"
 msgstr "Indizierte Dateien"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 msgid "Unindex the selected indexed file."
 msgstr "Die ausgewählte indizierte Datei aus der Index-Liste entfernen."
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 #, fuzzy
 msgid "gnunet-gtk"
 msgstr "gnunet-fs-gtk"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "_Statistiken"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 #, fuzzy
 msgid "Information about known and connected peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "Datentausc_h"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+#, fuzzy
+msgid "Voice conversation"
+msgstr "Konfiguration testen"
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfiguration:"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 msgid "Quit"
 msgstr "Beenden"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1737,29 +2218,21 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "<b>Name</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 msgid "Type:"
 msgstr "Typ:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "_Wert:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Typ"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
-msgstr "Wert"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 #, fuzzy
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr ""
@@ -1767,52 +2240,45 @@ msgstr ""
 "verwendet). Verwenden Sie das Kontextmenü (Rechtsklick), um die ausgewählten "
 "Einträge zu löschen."
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "Name"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Optionen zum Dateiaustausch</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 #, fuzzy
 msgid "Execute advertisement."
 msgstr "# Knotenankündigungen empfangen"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Datei hinzu_fügen"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "Bezeichner"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
@@ -1822,51 +2288,60 @@ msgstr ""
 "öffentlich ist, beginnt GNUnet mit der Veröffentlichung, was Sie später noch "
 "beeinflussen können (basierend auf den gewählten Ablaufdaten)."
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr "Name des Datensatzes in der Zone"
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr "in"
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
@@ -1874,104 +2349,115 @@ msgstr ""
 "Wählen Sie die gewünschte Zone für den Datensatz. Durch Änderung dieses "
 "Wertes wird der Datensatz in die gewählte Zone verschoben."
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 msgid "<b>Name</b>"
 msgstr "<b>Name</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
 msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
 msgstr ""
-"Geben Sie die IPv4-Adresse für den A-Datensatz hier ein. Das Format ist die "
-"übliche Zeichenkette aus Ziffern und Punkten (zum Beispiel 127.0.0.1)."
+"Geben Sie die IPv6-Adresse für den A-Datensatz hier ein. Das Format ist das "
+"übliche Format (zum Beispiel ::1)."
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
-msgstr "<b>IPv4-Zieladresse</b>"
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
+msgstr "<b>IPv6-Zieladresse</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
 msgid "Record is public (visible to other users)"
 msgstr "Datensatz ist öffentlich (für andere Benutzer sichtbar)"
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:285
 #: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
 msgid "Record is a shadow record (valid after other records expire)"
 msgstr ""
 "Der Datensatz ist verborgen (wird gültig, sobald andere Datensätze ablaufen)"
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
 msgid ""
 "A shadow record is a record which becomes valid in the future.  They are not "
 "used as long as a second non-expired record with the same name and type "
@@ -1989,51 +2475,60 @@ msgstr ""
 "werden zwei Datensätze im System platziert: einer, der bis Mitternacht "
 "gültig ist und ein »verborgener«, der danach gültig wird."
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
 msgid "<b>Options</b>"
 msgstr "<b>Optionen</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
 msgid "Relative"
 msgstr "Relativ"
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
 msgid ""
 "Records with a relative expiration time (such as 1 week) are always valid "
 "for at least that time period into the future. In other words, the auto-"
@@ -2052,35 +2547,41 @@ msgstr ""
 "relative Ablaufdaten für Einträge, von denen sie nicht wissen, wann diese "
 "ablaufen."
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
 msgid "Absolute"
 msgstr "Absolut"
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
 msgid ""
 "Records with an absolute expiration time are valid until the specified date. "
 "You can change that date to an even later date, but you cannot set it to an "
@@ -2095,35 +2596,41 @@ msgstr ""
 "Verwenden Sie absolute Ablaufdaten, wenn ein bestimmter Datensatz nur bis zu "
 "einem bestimmten Tag gültig sein wird."
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
 msgid "Never"
 msgstr "Nie"
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
 msgid ""
 "Records can be set to be valid forever. This is great if you are worried "
 "about censorship or certain that the mapping will never change.  Note that "
@@ -2136,19 +2643,22 @@ msgstr ""
 "unbegrenzten Gültigkeit diese später nie mehr ändern können, da andere "
 "Benutzer den alten Wert zwischengespeichert haben könnten."
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
 msgid ""
 "Select the date on which you want this record to expire. At that date, you "
 "can then create a new mapping or have a shadow record go automatically into "
@@ -2161,118 +2671,139 @@ msgstr ""
 "öffentliche Datensätze das Ablaufdatum nicht eher setzen können, als das "
 "tatsächliche."
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
 msgid "Hours:"
 msgstr "Stunden:"
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
 msgid "Which hour of the day selected above should the record expire?"
 msgstr ""
 "Zu welcher Stunde des oben ausgewählten Tages soll der Datensatz ablaufen?"
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
 msgid "Minutes:"
 msgstr "Minuten:"
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
 msgid "Which minute of the day selected above should the record expire?"
 msgstr ""
 "Zu welcher Minute des oben ausgewählten Tages soll der Datensatz ablaufen?"
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
 msgid "Seconds:"
 msgstr "Sekunden:"
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
 msgid "Which second of the day selected above should the record expire?"
 msgstr ""
 "Zu welcher Sekunde des oben ausgewählten Tages soll der Datensatz ablaufen?"
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
 msgid ""
 "Relative expiration time of the record.  The syntax is a number followed by "
 "a space and a time unit, possibly followed by additional numbers and time "
@@ -2287,54 +2818,259 @@ msgstr ""
 "der häufig verwendeten Vorgaben zu wählen. Die direkte Eingabe ist derzeit "
 "nicht möglich, da das Verhalten von Gtk2 und Gtk3 hier inkompatibel ist."
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
 msgid "<b>Expiration Time</b>"
 msgstr "<b>Ablaufzeit</b>"
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
 msgstr ""
-"Geben Sie die IPv6-Adresse für den A-Datensatz hier ein. Das Format ist das "
-"übliche Format (zum Beispiel ::1)."
+"Geben Sie die IPv4-Adresse für den A-Datensatz hier ein. Das Format ist die "
+"übliche Zeichenkette aus Ziffern und Punkten (zum Beispiel 127.0.0.1)."
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
-msgstr "<b>IPv6-Zieladresse</b>"
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr "<b>IPv4-Zieladresse</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+#, fuzzy
+msgid "_Port:"
+msgstr "Port:"
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr "Wichtung:"
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr "Port:"
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr "Priorität des Ziels, niedrigerer Wert bedeutet größere Bevorzugung"
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr "Relative Wichtung für Datensätze der gleichen Priorität"
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr "TCP- oder UDP-Port, wo der Dienst gefunden werden soll"
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr "Kanonischer Name des Rechners, der den Dienst bereitstellt"
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+msgid "<b>Service record (SRV)</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+#, fuzzy
+msgid "Usage:"
+msgstr "CPU Nutzung"
+
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
+#, fuzzy
+msgid "Selector:"
+msgstr "Vorschau auswählen"
+
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
+#, fuzzy
+msgid "Certificate:"
+msgstr "_Identifizierer:"
+
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:821
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
+#, fuzzy
+msgid "<b>TLSA Record Information</b>"
+msgstr "<b>Dienstkonfiguration</b>"
+
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:329
+msgid ""
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "<b>Name</b>"
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr "Geben Sie den Namen ein, für den dieser Name ein Alias ist."
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr "<b>Kanonischer Name (CNAME)</b>"
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2344,11 +3080,11 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
@@ -2356,25 +3092,25 @@ msgstr ""
 "Geben Sie den DNS-Namen an, unter dem das System mittels traditioneller DNS-"
 "Auflösung erreichbar ist."
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr "Geben Sie den Rechnernamen des Mailservers hier ein"
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr "Entfernung"
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr "<b>Mail eXchanger-Datensatz (MX)</b>"
 
@@ -2382,165 +3118,146 @@ msgstr "<b>Mail eXchanger-Datensatz (MX)</b>"
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "Knoten"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 #, fuzzy
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 "Geben Sie die Identität (gnunet-peerinfo -s) des Knotens hier ein, der den "
 "Dienst anbietet."
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 #, fuzzy
 msgid "Enter the phone line used for the user at the peer here."
 msgstr "Geben Sie den Rechnernamen des Mailservers hier ein"
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Schlüsselbegriffe</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 #, fuzzy
 msgid "Enter the public key of the authority here."
 msgstr ""
 "Geben Sie die Prüfsumme des öffentlichen Schlüssels der Ausgabestelle hier "
 "ein."
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 #, fuzzy
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr "<b>GADS-Autorität für die Subzone (PKEY)</b>"
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr "<b>Kanonischer Name (PTR)</b>"
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr "Quellrechner:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr "Kontakt-E-Mail:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr "Seriennummer:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr "Auffrischungszeit:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr "Zeit bis zum erneuten Versuch:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr "Ablaufzeit:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr "Minimale TTL:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr "Diese Zahl sollte für jede Zonenaktualisierung erhöht werden."
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr "Der Wert wird in Sekunden angegeben."
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr "Name des Rechners, der für die Zone zuständig ist."
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 "Beachten Sie, dass ».« anstelle des address@hidden in der E-Mail-Adresse 
verwendet wird!"
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr "Wichtung:"
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr "Port:"
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr "Ziel:"
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
-msgstr "Priorität des Ziels, niedrigerer Wert bedeutet größere Bevorzugung"
-
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
-msgstr "Relative Wichtung für Datensätze der gleichen Priorität"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
-msgstr "TCP- oder UDP-Port, wo der Dienst gefunden werden soll"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
-msgstr "Kanonischer Name des Rechners, der den Dienst bereitstellt"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-msgid "<b>Service record (SRV)</b>"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr "<b>Text-Wert (TXT)</b>"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr "Protokoll:"
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 msgid "Peer:"
 msgstr "Knoten"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr "TCP"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr "Dienst ist über TCP verfügbar"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr "UDP"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr "Dienst ist über UDP verfügbar"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
@@ -2548,7 +3265,7 @@ msgstr ""
 "Geben Sie die Identität (gnunet-peerinfo -s) des Knotens hier ein, der den "
 "Dienst anbietet."
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
@@ -2558,40 +3275,87 @@ msgstr ""
 "Passwort), der durch den Anbieter des Dienstes frei gewählt werden kann. "
 "Diese Zeichenkette sollte hier eingegeben werden."
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 #, fuzzy
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr "<b>GNUnet VPN-Adresse (nur GADS)</b>"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr "GNS-Eintrag bearbeiten"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "gnunet-fs-gtk"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
 #, fuzzy
-msgid "Preferred zone name (NICK):"
-msgstr "Bevorzugter Zonenname (PSEU):"
+msgid " _Select Zone"
+msgstr "Datei auswählen"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 msgid "QR code for the selected zone"
 msgstr "QR-Code für die ausgewählte Zone"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr "<b><big>Wird geladen …</big></b>"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
-msgstr "GNS-Eintrag bearbeiten"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+#, fuzzy
+msgid "  _Edit Zone "
+msgstr "_Private Zone"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-msgid "Edit"
-msgstr "Bearbeiten"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 msgid "About gnunet-peerinfo-gtk"
@@ -3216,65 +3980,60 @@ msgstr ""
 "Phan Vinh Thinh <address@hidden>\n"
 "Daniel Nylander <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 msgid "Address valid?"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 msgid "gnunet-peerinfo-gtk"
 msgstr "gnunet-peerinfo-gtk"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr "Informationen zu dieser Version von gnunet-peerinfo-gtk anzeigen"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 #, fuzzy
 msgid "Friend"
 msgstr "Freunde-Datei:"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "Status"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 msgid "About gnunet-setup"
 msgstr "Info zu gnunet-setup"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 msgid "gnunet-setup"
 msgstr "gnunet-setup"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr "Dienste:"
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr "Topologie"
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
@@ -3282,11 +4041,11 @@ msgstr ""
 "Das Topologie-Subsystem ist notwendig, damit sich Ihr Knoten mit anderen "
 "Knoten verbinden kann."
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr "Rechnerliste"
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
@@ -3296,25 +4055,36 @@ msgstr ""
 "können Sie wählen, eine Rechnerliste anzubieten oder einrichten, welche "
 "Rechnerlisten anderer Knoten Sie verwenden wollen."
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 msgid "File _Sharing"
 msgstr "Datentausc_h"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr "Das Dateiaustausch-Subsystem von GNUnet aktivieren."
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
-msgstr "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+#, fuzzy
+msgid "VPN"
+msgstr "_VPN"
+
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:495
+#, fuzzy
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 "Mit den PT/VPN-Subsystemen können Sie Ihren Internetverkehr über GNUnet "
 "tunneln. Dies ist sinnvoll, wenn Sie auf das IPv4-Internet zugreifen wollen, "
@@ -3322,11 +4092,11 @@ msgstr ""
 "Sie nur über WLAN mit anderen Knoten verbunden sind, Internetzugang "
 "erhalten, indem der IP-Verkehr über GNUnet geroutet wird."
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr "EXIT"
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3346,11 +4116,11 @@ msgstr ""
 "Server mit ausschließlich IPv4 von IPv6-Clients aus und auf Server mit "
 "ausschließlich IPv6 von IPv4-Clients aus zugreifen können."
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr "GNS"
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
@@ -3360,254 +4130,232 @@ msgstr ""
 "die ».gnunet«-Adresserweiterung auf Ihrem System verfügbar. Sie werden für "
 "Ihre ».gnunet«-TLD verantwortlich sein."
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Dienstkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 msgid "F_2F only"
 msgstr "Nur F_2F"
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 msgid "Min. connected friends:"
 msgstr "Minimal verbundene Freunde"
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr "<b>Freund-zu-Freund-Konfiguration (schränkt P2P-Verbindungen ein)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "All_gemein"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr "Rechnerlisten-Server betreiben"
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr "Rechnerlisten-Server bereitstellen"
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr "Bekannte Rechnerlisten-Server:"
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "All_gemein"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr "Maximale Download-Bandbreite (B/s):"
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr "Maximale Upload-Bandbreite (B/s)"
-
-#: contrib/gnunet_setup_main_window.glade:733
-msgid "<b>Bandwidth Configuration</b>"
-msgstr "<b>Bandbreitenkonfiguration</b>"
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr "Knoten ist hinter _NAT"
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
+#, fuzzy
+msgid "_Proxy type:"
+msgstr "_Veröffentlichungstyp:"
 
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
-"Aktivieren Sie dieses Ankreuzfeld, falls sich Ihr Rechner hinter einem NAT "
-"befindet (Router, der die Netzwerkadressen umwandelt). Aktivieren Sie es "
-"nicht, wenn Ihr Rechner eine global eindeutige IPv4-Adresse hat. NAT-"
-"Optionen wirken sich derzeit nur auf IPv4-Adressen aus."
 
-#: contrib/gnunet_setup_main_window.glade:783
-msgid "Attempt automatic configuration"
-msgstr "Automatische Konfiguration versuchen"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
-msgstr "IPv_6-Unterstützung deaktivieren"
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
-msgstr "NAT-Ports wurden manuell geöffnet"
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
-msgstr "NAT-Traversal über UPnP oder PMP aktivieren"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
-"Diese Option aktiviert die Nutzung von upnpc von miniupnpd für NAT-Traversal"
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
-msgstr "NAT-Traversal mit der ICMP-Methode aktivieren"
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "Benutzername:"
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+#, fuzzy
+msgid "Proxy password:"
+msgstr "Passwort:"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
-msgstr ""
-"Globale sichtbare IP-Adress Ihres Systems (IP-Adresse der externen "
-"Schnittstelle oder des NAT). Sie können auch einen Rechnernamen angeben. In "
-"diesem Fall schaut GNUnet periodisch nach dem Rechnernamen in der DNS-"
-"Auflösung, um Ihre externe IP-Adresse zu ermitteln (DynDNS-Einrichtung)."
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<b>Transportkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr "Externe (öffentliche) IPv4-Adresse:"
+#: contrib/gnunet_setup_main_window.glade:1248
+#, fuzzy
+msgid "_Hostlist"
+msgstr "Rechnerliste"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
-msgstr "Verbindung zu Knoten hinter NAT mit der ICMP-Methode ermöglichen"
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
+msgstr "Maximale Download-Bandbreite (B/s):"
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1294
+#, fuzzy
+msgid "Max. upload bandwidth (B/s):"
+msgstr "Maximale Upload-Bandbreite (B/s)"
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
-"Geben Sie die IPv4-Adresse der Haupt-Netzwerkschnittstelle Ihres Rechners an "
-"(typischerweise eth0 oder wlan0)."
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
-msgstr "Interne (private) IPv4-Adresse:"
-
-#: contrib/gnunet_setup_main_window.glade:1018
-msgid "<b>NAT Traversal Configuration</b>"
-msgstr "<b>NAT-Traversal-Konfiguration</b>"
+#: contrib/gnunet_setup_main_window.glade:1343
+msgid "<b>Bandwidth Configuration</b>"
+msgstr "<b>Bandbreitenkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr "_Netzwerk"
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr "Zu verwendende Plugins:"
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr "_TCP"
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr "_UDP"
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr "_HTTP-Client"
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr "HTT_P-Server"
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr "HTTPS-_Client"
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr "HTTPS-_Server"
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr "D_V"
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr "_WLAN"
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr "Bindung an Port:"
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr "Port »0« verwenden, um nur ausgehende TCP-Verbindungen zuzulassen"
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr "Bereitgestellter Port:"
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 msgid "Test configuration"
 msgstr "Konfiguration testen"
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
@@ -3618,177 +4366,219 @@ msgstr ""
 "für Testzwecke bitten. Dieser Test kann nur funktionieren, wenn Sie während "
 "des Tests nicht Ihren Knoten betreiben."
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr "Konfiguration funktioniert!"
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr "Test ist fehlgeschlagen!"
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
-msgstr "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+#, fuzzy
+msgid "HTTP-Server"
+msgstr "HTT_P-Server"
+
+#: contrib/gnunet_setup_main_window.glade:2424
+#, fuzzy
+msgid "HTTP-Client"
+msgstr "_HTTP-Client"
+
+#: contrib/gnunet_setup_main_window.glade:2625
+#, fuzzy
+msgid "HTTPS-Server"
+msgstr "HTTPS-_Server"
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
-msgstr "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2891
+#, fuzzy
+msgid "HTTPS-Client"
+msgstr "HTTPS-_Client"
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr "DV"
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr "Name der _Überwachungsschnittstelle"
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr "WLAN"
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Transportkonfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr "_Transport"
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr "Zwischengespeicherten Inhalt auf diesem Knoten erlauben"
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Optionen zum Dateiaustausch</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr "Zu verwendendes Datenbank-Backend:"
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr "sqLite"
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr "MySQL"
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 msgid "Postgres"
 msgstr "Postgres"
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr "Kontingent (Bytes):"
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr "Keine Einrichtung notwendig."
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr "MySQL-Datenbankname:"
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 msgid "gnunet"
 msgstr "gnunet"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 msgid "Configuration file:"
 msgstr "Konfigurationsdatei:"
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr "Passwort:"
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr "MySQL-Server-Rechnername:"
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr "localhost"
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr "Konfigurationsfehler!"
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 msgid "Configuration:"
 msgstr "Konfiguration:"
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr "<b>Datenspeicher einrichten (dauerhafte Speicherung)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr "Datenzwischenspeicher:"
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr "Speicher"
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr "<b>Datenzwischenspeicher einrichten (temporärer Speicher)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 msgid "_File Sharing"
 msgstr "Datentausc_h"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr "Schn_ittstellenname:"
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr "IPv4-Adresse der Schnittstelle:"
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr "/"
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr "IPv6-Adresse der Schnittstelle:"
+
+#: contrib/gnunet_setup_main_window.glade:4184
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<b>GNUnet-Schnittstellenkonfiguration</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr "IPv4-Netzwerkverkehr tunneln"
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3796,11 +4586,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr "IPv6-Netzwerkverkehr tunneln"
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3808,11 +4598,11 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 msgid "Tunnel DNS Traffic"
 msgstr "DNS-Netzwerkverkehr tunneln"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3823,41 +4613,11 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Konfiguration der Protokollumwandlung und Tunnelung</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr "Schn_ittstellenname:"
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr "IPv4-Adresse der Schnittstelle:"
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr "/"
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr "IPv6-Adresse der Schnittstelle:"
-
-#: contrib/gnunet_setup_main_window.glade:3486
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<b>GNUnet-Schnittstellenkonfiguration</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
@@ -3865,19 +4625,20 @@ msgstr ""
 "Konfiguration des VPN und der Protokollumwandlung (6to4, 4to6, 6over4, "
 "4over6) für GNUnet"
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+#, fuzzy
+msgid "_VPN/PT"
 msgstr "_VPN"
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr "DNS-Exit aktivieren"
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr "IPv4-Exit aktivieren"
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
@@ -3885,11 +4646,11 @@ msgstr ""
 "Diese Option ermöglicht anderen Knoten, IPv4-Verkehr zum Internet über Ihre "
 "Netzwerkverbindung abzuwickeln."
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr "IPv6-Exit aktivieren"
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
@@ -3899,25 +4660,25 @@ msgstr ""
 "Netzwerkverbindung abzuwickeln. Sie sollten sicherstellen, dass Sie über "
 "IPv6-Unterstützung verfügen, bevor Sie diese Option aktivieren."
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr "IP-Adresse der externen DNS-Namensauflösung:"
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr "Exit-Schnittstellenname:"
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr "IPv4-Adresse für Exit-Schnittstelle:"
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
@@ -3927,76 +4688,72 @@ msgstr ""
 "Konfiguration nicht im Konflikt steht (beispielsweise etwas wie "
 "10.53.0.1/255.255.0.0 oder 192.168.0.1/255.255.0.0).  "
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr "IPv6-Adresse für Exit-Schnittstelle:"
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>GNUnet Exit-Konfiguration</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<b>Ablaufzeit</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "_Identifizierer:"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 #, fuzzy
 msgid "_Port"
 msgstr "Port:"
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "Beschreibung"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr "B_eenden"
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr "<b>Namensspeicher einrichten (dauerhafte Speicherung)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr "<b>Namenssystem von GNUnet einrichten</b>"
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 msgid "GNS & N_amestore"
 msgstr "GNS und N_amensspeicher"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 msgid "Welcome to gnunet-setup."
 msgstr "Willkommen zu gnunet-setup."
 
@@ -4004,11 +4761,11 @@ msgstr "Willkommen zu gnunet-setup."
 msgid "About gnunet-statistics-gtk"
 msgstr "Info zu gnunet-statistics-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 msgid "gnunet-statistics-gtk"
 msgstr "gnunet-statistics-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr "Informationen zu dieser Version von gnunet-statistics-gtk anzeigen"
 
@@ -4016,14 +4773,189 @@ msgstr "Informationen zu dieser Version von 
gnunet-statistics-gtk anzeigen"
 msgid "_Connections"
 msgstr "_Verbindungen"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 msgid "_Traffic"
 msgstr "Ne_tzwerkverkehr"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr "_Speicherung"
 
+#~ msgid "start in tray mode"
+#~ msgstr "im Benachrichtigungsfeld minimiert starten"
+
+#~ msgid ""
+#~ "Could not determine installation path for %s.  Set `%s' environment "
+#~ "variable.\n"
+#~ msgstr ""
+#~ "Der Installationspfad für %s konnte nicht ermittelt werden. Setzen Sie "
+#~ "die Umgebungsvariable »%s«.\n"
+
+#, fuzzy
+#~ msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+#~ msgstr "Name »%s« ungültig für GADS/DNS (zu lang für ein DNS-Label?)\n"
+
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<b>Zone %s bearbeiten</b>"
+
+#~ msgid "Check if this peer is behind a NAT"
+#~ msgstr "Überprüfen, ob sich der Knoten hinter einem NAT befindet"
+
+#~ msgid "Check if the NAT has been configured manually to forward ports"
+#~ msgstr ""
+#~ "Überprüfen, ob NAT manuell für die Port-Weiterleitung eingerichtet wurde"
+
+#~ msgid "Enable NAT traversal with UPnP/PMP"
+#~ msgstr "NAT-Traversal mit UPnP/PMP aktivieren"
+
+#~ msgid "Enable NAT traversal with ICMP as server"
+#~ msgstr "NAT-Traversal mit ICMP als Server aktivieren"
+
+#~ msgid "External (public) IP address of the NAT"
+#~ msgstr "Externe (öffentliche) IP-Adresse des NAT"
+
+#~ msgid "Enable NAT traversal with ICMP as client"
+#~ msgstr "NAT-Traversal mit ICMP als Client aktivieren"
+
+#~ msgid "Internal (private) IP address of the NAT"
+#~ msgstr "Interne (private) IP-Adresse des NAT"
+
+#~ msgid "Disable IPv6 support"
+#~ msgstr "IPv6-Unterstützung deaktivieren"
+
+#~ msgid "NAT traversal with ICMP Server succeeded.\n"
+#~ msgstr "NAT-Traversal mit ICMP als Server erfolgreich aktiviert.\n"
+
+#~ msgid "NAT traversal with ICMP Server failed.\n"
+#~ msgstr "NAT-Traversal mit ICMP als Server fehlgeschlagen.\n"
+
+#~ msgid "NAT traversal with ICMP Server timed out.\n"
+#~ msgstr ""
+#~ "Zeitüberschreitung bei Einrichtung von NAT-Traversal mit ICMP als "
+#~ "Server.\n"
+
+#~ msgid "Testing connection reversal with ICMP server.\n"
+#~ msgstr "Verbindung wird umgekehrt mit ICMP-Server getestet.\n"
+
+#~ msgid "Detected external IP `%s'\n"
+#~ msgstr "Extern IP »%s« gefunden\n"
+
+#~ msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#~ msgstr ""
+#~ "Dieses System hat eine globale IPv6-Adresse, diese wird gesetzt, um IPv6 "
+#~ "zu unterstützen.\n"
+
+#~ msgid "Detected internal network address `%s'.\n"
+#~ msgstr "Interne Netzwerkadresse »%s« erkannt.\n"
+
+#~ msgid "upnpc found, enabling its use\n"
+#~ msgstr "upnpc gefunden, wird aktiviert\n"
+
+#~ msgid "upnpc not found\n"
+#~ msgstr "upnpc nicht gefunden\n"
+
+#~ msgid "gnunet-helper-nat-server found, testing it\n"
+#~ msgstr "gnunet-helper-nat-server gefunden, wird getestet\n"
+
+#~ msgid "No working gnunet-helper-nat-server found\n"
+#~ msgstr "Kein funktionierender gnunet-helper-nat-server gefunden\n"
+
+#~ msgid "gnunet-helper-nat-client found, enabling it\n"
+#~ msgstr "gnunet-helper-nat-client gefunden, wird aktiviert\n"
+
+#~ msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#~ msgstr ""
+#~ "gnunet-helper-nat-client nicht gefunden oder hinter NAT, wird "
+#~ "deaktiviert\n"
+
+#~ msgid "Attempting fully-automatic, non-interactive network configuration\n"
+#~ msgstr ""
+#~ "Vollautomatische, nicht-interaktive Netzwerkkonfiguration wird versucht\n"
+
+#~ msgid "attempt automatic configuration of the network and instantly exit"
+#~ msgstr ""
+#~ "automatische Netzwerkkonfiguration versuchen und dann unmittelbar beenden"
+
+#, fuzzy
+#~ msgid "Preferred zone name (NICK):"
+#~ msgstr "Bevorzugter Zonenname (PSEU):"
+
+#~ msgid "PT/VPN"
+#~ msgstr "PT/VPN"
+
+#~ msgid "Peer is behind _NAT"
+#~ msgstr "Knoten ist hinter _NAT"
+
+#~ msgid ""
+#~ "Check this box if your machine is behind a NAT box (router that performs "
+#~ "network address translation).  Leave off if your machine has a globally "
+#~ "unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#~ msgstr ""
+#~ "Aktivieren Sie dieses Ankreuzfeld, falls sich Ihr Rechner hinter einem "
+#~ "NAT befindet (Router, der die Netzwerkadressen umwandelt). Aktivieren Sie "
+#~ "es nicht, wenn Ihr Rechner eine global eindeutige IPv4-Adresse hat. NAT-"
+#~ "Optionen wirken sich derzeit nur auf IPv4-Adressen aus."
+
+#~ msgid "Attempt automatic configuration"
+#~ msgstr "Automatische Konfiguration versuchen"
+
+#~ msgid "Disable IPv_6 support"
+#~ msgstr "IPv_6-Unterstützung deaktivieren"
+
+#~ msgid "NAT ports have been opened manually"
+#~ msgstr "NAT-Ports wurden manuell geöffnet"
+
+#~ msgid "Enable NAT traversal via UPnP or PMP"
+#~ msgstr "NAT-Traversal über UPnP oder PMP aktivieren"
+
+#~ msgid ""
+#~ "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#~ msgstr ""
+#~ "Diese Option aktiviert die Nutzung von upnpc von miniupnpd für NAT-"
+#~ "Traversal"
+
+#~ msgid "Enable NAT traversal using ICMP method"
+#~ msgstr "NAT-Traversal mit der ICMP-Methode aktivieren"
+
+#~ msgid ""
+#~ "Globally visible IP address of your system (IP address of the external "
+#~ "interface of your NAT).  You can also specify a hostname, in which case "
+#~ "GNUnet will periodically look up the hostname in DNS to determine our "
+#~ "external IP address (DynDNS setup)."
+#~ msgstr ""
+#~ "Globale sichtbare IP-Adress Ihres Systems (IP-Adresse der externen "
+#~ "Schnittstelle oder des NAT). Sie können auch einen Rechnernamen angeben. "
+#~ "In diesem Fall schaut GNUnet periodisch nach dem Rechnernamen in der DNS-"
+#~ "Auflösung, um Ihre externe IP-Adresse zu ermitteln (DynDNS-Einrichtung)."
+
+#~ msgid "External (public) IPv4 address:"
+#~ msgstr "Externe (öffentliche) IPv4-Adresse:"
+
+#~ msgid "Enable connecting to NATed peers using ICMP method"
+#~ msgstr "Verbindung zu Knoten hinter NAT mit der ICMP-Methode ermöglichen"
+
+#~ msgid ""
+#~ "Specify the IPv4 address of your computers main network interface "
+#~ "(typically eth0 or wlan0)."
+#~ msgstr ""
+#~ "Geben Sie die IPv4-Adresse der Haupt-Netzwerkschnittstelle Ihres Rechners "
+#~ "an (typischerweise eth0 oder wlan0)."
+
+#~ msgid "Internal (private) IPv4 address:"
+#~ msgstr "Interne (private) IPv4-Adresse:"
+
+#~ msgid "<b>NAT Traversal Configuration</b>"
+#~ msgstr "<b>NAT-Traversal-Konfiguration</b>"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "<b>Configure GNUnet Naming System</b>"
+#~ msgstr "<b>Namenssystem von GNUnet einrichten</b>"
+
 #~ msgid "Failed to initialize communication with peerinfo service!\n"
 #~ msgstr ""
 #~ "Kommunikation mit dem peerinfo-Dienst konnte nicht initialisiert werden.\n"
@@ -4048,9 +4980,6 @@ msgstr "_Speicherung"
 #~ msgid "Invalid pseudonym specified for zone"
 #~ msgstr "Ungültiges Pseudonym für Zone angegeben"
 
-#~ msgid "Failed to commit record to database"
-#~ msgstr "Datensatz konnte nicht in die Datenbank eingefügt werden"
-
 #~ msgid "Internal error"
 #~ msgstr "Interner Fehler"
 
@@ -4227,9 +5156,6 @@ msgstr "_Speicherung"
 #~ msgid "_Master Zone"
 #~ msgstr "_Master-Zone"
 
-#~ msgid "_Private Zone"
-#~ msgstr "_Private Zone"
-
 #~ msgid "GAD_S"
 #~ msgstr "GAD_S"
 
@@ -4353,9 +5279,6 @@ msgstr "_Speicherung"
 #~ msgid "no name given"
 #~ msgstr "Unbenannt"
 
-#~ msgid "Failed to parse given time interval!"
-#~ msgstr "Fehler beim Parsen des angegebenen Zeitintervalls."
-
 #~ msgid "Failed to start collection `%s' (consult logs)."
 #~ msgstr "Fehler beim Starten der Collection %s (siehe Logs)."
 
@@ -4405,16 +5328,9 @@ msgstr "_Speicherung"
 #~ "Fehler beim Uploaden der Datei: %s\n"
 
 #, fuzzy
-#~ msgid "Downloading `%s'\n"
-#~ msgstr "Downloading `%s'"
-
-#, fuzzy
 #~ msgid "ERROR: already downloading `%s'"
 #~ msgstr "Fehler beim Download: %s\n"
 
-#~ msgid "Invalid URI `%s'"
-#~ msgstr "Ungültige URI: `%s'"
-
 #~ msgid ""
 #~ "Failed to create namespace `%s'.Consult logs, most likely error is that a "
 #~ "namespace with that name already exists."
@@ -4431,10 +5347,6 @@ msgstr "_Speicherung"
 #~ msgid "Bandwidth"
 #~ msgstr "Bandbreitenbeschränkung"
 
-#, fuzzy
-#~ msgid "Identity"
-#~ msgstr "_Identifizierer:"
-
 #~ msgid "Could not initialize libnotify\n"
 #~ msgstr "libnotify konnte nicht initialisiert werden\n"
 
@@ -4645,10 +5557,6 @@ msgstr "_Speicherung"
 #~ msgstr "Schlüsselwörter für Dateien in Verzeichnissen hinzufügen"
 
 #, fuzzy
-#~ msgid "C_reate"
-#~ msgstr "E_rzeugen"
-
-#, fuzzy
 #~ msgid "D_elete"
 #~ msgstr "Lösch_en"
 
@@ -4664,10 +5572,6 @@ msgstr "_Speicherung"
 #~ "Sammlung abschließen (es werden keine Inhalte gelöscht, die sich bereits "
 #~ "in der Sammlung befinden)"
 
-#, fuzzy
-#~ msgid "<b>Available content</b>"
-#~ msgstr "<b>Verfügbare Inhalte</b>"
-
 #~ msgid ""
 #~ "should GNUnet track available content (for publishing in namespaces)?"
 #~ msgstr ""
@@ -4775,9 +5679,6 @@ msgstr "_Speicherung"
 #~ msgid "Lists all of the keywords that will be used."
 #~ msgstr "Liste aller Schlüsselwörter die benutzt werden sollen"
 
-#~ msgid "Select Preview"
-#~ msgstr "Vorschau auswählen"
-
 #~ msgid "File Information"
 #~ msgstr "Dateiinformation"
 
@@ -5078,9 +5979,6 @@ msgstr "_Speicherung"
 #~ "Sie müssen in der Konfigurationsdatei in Sektion `%s' unter `%s' ein "
 #~ "Verzeichnis angeben."
 
-#~ msgid "Uploading `%s'"
-#~ msgstr "Lade `%s' hoch."
-
 #~ msgid "Use --help to get a list of options.\n"
 #~ msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
@@ -6203,9 +7101,6 @@ msgstr "_Speicherung"
 #~ msgstr ""
 #~ "Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#~ msgid "Time:\n"
-#~ msgstr "Zeit:\n"
-
 #, fuzzy
 #~ msgid "\tmax      %d\n"
 #~ msgstr "\tMax      %u\n"
@@ -6311,9 +7206,6 @@ msgstr "_Speicherung"
 #~ msgid "unloading module failed.  Notifying client.\n"
 #~ msgstr "das Entladen des Moduls schlug fehl. Client wird benachrichtigt.\n"
 
-#~ msgid "`%s' %s failed: %s\n"
-#~ msgstr "`%s' %s schlug fehl: %s\n"
-
 #~ msgid "received invalid `%s' message: %s.\n"
 #~ msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
@@ -6790,9 +7682,6 @@ msgstr "_Speicherung"
 #~ msgid "Could not release %p: service not loaded\n"
 #~ msgstr "%p kann nicht freigegeben werden: Dienst ist nicht geladen\n"
 
-#~ msgid "No applications defined in configuration!\n"
-#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
 #~ msgid "Could not properly shutdown application `%s'.\n"
 #~ msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
 
@@ -7108,9 +7997,6 @@ msgstr "_Speicherung"
 #~ msgid "Caught signal %d.\n"
 #~ msgstr "Signal %d empfangen.\n"
 
-#~ msgid "inlining configration file `%s'\n"
-#~ msgstr "Binde Konfigurationsdatei `%s' ein\n"
-
 #~ msgid "Syntax error in configuration file `%s' at line %d.\n"
 #~ msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
@@ -7296,13 +8182,6 @@ msgstr "_Speicherung"
 #~ "Geräteangabe (%s) in der Konfigurationssektion `%s' unter `%s' ist "
 #~ "beschädigt.\n"
 
-#~ msgid ""
-#~ "No network interfaces specified in the configuration file in section `%s' "
-#~ "under `%s'.\n"
-#~ msgstr ""
-#~ "Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion "
-#~ "'%s' unter `%s' definiert.\n"
-
 #~ msgid "Failed to parse interface data `%s' output at %s:%d.\n"
 #~ msgstr "Fehler beim Parsen der Gerätedaten `%s' Ausgabe bei %s:%d.\n"
 
@@ -7581,9 +8460,6 @@ msgstr "_Speicherung"
 #~ msgid "Max. CPU usage (%):"
 #~ msgstr "Max. CPU Nutzung (%):"
 
-#~ msgid "CPU usage"
-#~ msgstr "CPU Nutzung"
-
 #~ msgid "Load limitation"
 #~ msgstr "Lastbeschränkung"
 
@@ -7787,9 +8663,6 @@ msgstr "_Speicherung"
 #~ msgid "Only one file or directory can be specified at a time.\n"
 #~ msgstr "Nur eine Datei oder Verzeichnis kann auf einmal angegeben werden.\n"
 
-#~ msgid "Error converting arguments to URI!\n"
-#~ msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
-
 #~ msgid ""
 #~ "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 #~ "completion)                "
@@ -7866,9 +8739,6 @@ msgstr "_Speicherung"
 #~ msgid "LOC URI not allowed for search.\n"
 #~ msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
 
-#~ msgid "Format of file `%s' is invalid.\n"
-#~ msgstr "Format der Datei `%s' ist ungültig.\n"
-
 #~ msgid "`%s' registering client handler %d\n"
 #~ msgstr "`%s' registriert Client-Handler %d\n"
 
diff --git a/po/es.po b/po/es.po
index 1357df23..f35223f1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.9.5\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2013-02-10 12:41+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -17,30 +17,180 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Seleccione un tipo"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Expresión regular «%s» no válida\n"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "Expresión regular «%s» no válida\n"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "Expresión regular «%s» no válida\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, fuzzy, c-format
+msgid "Adding contact failed: %s\n"
+msgstr "Operación fallida (pulse cancelar)\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, fuzzy, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr "No se pudo analizar la cadena de registro VPN «%s»\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "Se produjo un fallo al eliminar el registro"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "Se produjo un fallo al eliminar el registro"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+msgid "connected"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+msgid "Failed to setup phone (internal error)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, c-format
+msgid "Resolving `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, c-format
+msgid "Calling `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr "arrancar en la bandeja del sistema"
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -50,12 +200,12 @@ msgstr ""
 "Se produjo un fallo al validar la cadena «%s» supuestamente utf-8 de "
 "longitud %u, suponiendo que es una cadena tipo C\n"
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr "¡El fichero seleccionado «%s» no es un directorio GNUnet!\n"
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 msgid "no description supplied"
 msgstr "no se ha proporcionado descripción"
 
@@ -64,103 +214,103 @@ msgstr "no se ha proporcionado descripción"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "Se produjo un fallo al cargar «%s»: %s\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 msgid "_Download"
 msgstr "_Descargar"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 msgid "Download _recursively"
 msgstr "Descargar _recursivamente"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 msgid "Download _as..."
 msgstr "Descargar _como..."
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 msgid "_Abort download"
 msgstr "C_ancelar descarga"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr "_Copiar URI al portapapeles"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr "¡Error!"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 msgid "no URI"
 msgstr "sin URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 msgid "_Abort publishing"
 msgstr "C_ancelar publicación"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr "Se produjo un fallo al eliminar el registro"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr "Cadena de palabras clave «%s» no válida: %s"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "Se produjo un fallo al eliminar el registro"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando el directorio «%s».\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr "Se produjo un fallo al escanear «%s» (error de acceso). Omitiendo.\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, c-format
 msgid "Processed file `%s'.\n"
 msgstr "Procesado fichero «%s».\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr "Operación fallida (pulse cancelar)\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr "El escáner ha finalizado.\n"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 msgid "Select a type"
 msgstr "Seleccione un tipo"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr "Especifique un valor"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "No se pudo cargar la previsualización de «%s» en memoria\n"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr "<sin nombre>"
 
@@ -169,87 +319,88 @@ msgstr "<sin nombre>"
 msgid "Could not access indexed file `%s'\n"
 msgstr "No se pudo acceder al fichero indexado «%s»\n"
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Puerto anunciado:"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "Se produjo un fallo al cargar «%s»: %s\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Puerto anunciado:"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, c-format
 msgid "Failed to load animation from file `%s'\n"
 msgstr "Se produjo un fallo al cargar la animación del fichero «%s»\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "Expresión regular «%s» no válida\n"
 
-#: src/lib/glade.c:123
-#, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "Se produjo un fallo al cargar «%s»: %s\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
+msgstr "Se produjo un fallo al inicializar el widget «%s»\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
-"No se pudo determinar la ruta de instalación de %s.  Fije la variable de "
-"entorno «%s».\n"
 
-#: src/main/gnunet-gtk.c:220
+#: src/lib/glade.c:133
 #, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+msgid "Failed to load `%s': %s\n"
+msgstr "Se produjo un fallo al cargar «%s»: %s\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+#, fuzzy
+msgid "<new zone>"
 msgstr "<nuevo nombre>"
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr "<nuevo nombre>"
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr "<nuevo registro>"
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr "nunca"
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr "no válido"
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr ""
 "Se produjo un fallo al inicializar el buffer de píxeles para códigos QR"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 msgid "Failed to initialize QR-code pixbuf"
 msgstr ""
 "Se produjo un fallo al inicializar el buffer de píxeles para códigos QR"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, fuzzy, c-format
 msgid "Operation failed: `%s'\n"
 msgstr "Operación fallida (pulse cancelar)\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
@@ -258,32 +409,41 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+#, fuzzy
+msgid "Failed to communicate with database"
+msgstr "Se produjo un fallo al guardar el registro en la base de datos"
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "Se produjo un fallo al cargar «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr "Se produjo un fallo al cargar la animación del fichero «%s»\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr "Se produjo un fallo al cargar la animación del fichero «%s»\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -291,54 +451,69 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr "Tipo de registro no soportado"
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, fuzzy, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 "Nombre «%s» no válido para GADS/DNS (¿demasiado largo para una etiqueta "
 "DNS?)\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
-#, fuzzy, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
-msgstr ""
-"Nombre «%s» no válido para GADS/DNS (¿demasiado largo para una etiqueta "
-"DNS?)\n"
-
-#: src/namestore/gnunet-namestore-gtk.c:2258
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
 msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 "Se obtuvo el nombre de registro «%s» no válido del almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Editando zona %s</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr ""
 "<b><big>Se produjo un fallo al conectar con el almacén de nombres</b></big>"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "No se pudo analizar el registro MX «%s»\n"
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -354,16 +529,140 @@ msgstr "No se pudo analizar el registro MX «%s»\n"
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo analizar el registro SOA «%s»\n"
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "No se pudo analizar el registro SOA «%s»\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr "No se pudo analizar el registro SOA «%s»\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "Se produjo un fallo al inicializar el widget «%s»\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "Se produjo un fallo al cargar «%s»: %s\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "Se produjo un fallo al inicializar el widget «%s»\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "Se produjo un fallo al cargar «%s»: %s\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+#, fuzzy
+msgid "Name resolution failed\n"
+msgstr "Operación fallida (pulse cancelar)\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, fuzzy, c-format
+msgid "Unsupported address family %d\n"
+msgstr "Tipo de registro no soportado"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "Se produjo un fallo al cargar «%s»: %s\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "Se produjo un fallo al inicializar el widget «%s»\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo analizar la cadena de registro VPN «%s»\n"
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "Se produjo un fallo al crear el registro"
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr "Widget «%s» no encontrado\n"
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr "Expresión regular «%s» no válida\n"
+
+#: src/setup/gnunet-setup.c:209
+#, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr ""
+"Se produjo un fallo al obtener el valor de una opción del widget «%s»\n"
+
+#: src/setup/gnunet-setup.c:271
+#, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Se produjo un fallo al inicializar el widget «%s»\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+"No hay un valor predeterminado conocido para la opción «%s» en la sección "
+"«%s»\n"
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr "Se produjo un fallo al inicializar el widget «%s» con el valor «%s»\n"
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+"Introduzca SU contraseña para ejecutar «gnunet-setup» como usuario "
+"«gnunet» (asumiendo que 'sudo' lo permita)"
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "Acerca de «gnunet-peerinfo-gtk»"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+"ejecutar como usuario «gnunet», si es necesario ejecutando «gksu» para "
+"obtener permiso"
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -397,303 +696,325 @@ msgstr ""
 "¡No se pudo determinar si el demonio de listas de máquinas tiene un servidor "
 "de listas de máquinas integrado!\n"
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr "el servidor de listas de máquinas"
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr "el módulo de transporte TCP"
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr "el módulo de transporte HTTP"
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr "el módulo de transporte HTTPS"
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr "Widget «%s» no encontrado\n"
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr "El objecto especificado «%s» no es un botón seleccionable\n"
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr "El widget seleccionado «%s» no es un botón selector (spinbutton)\n"
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr "Este puerto está ocupado actualmente por %s."
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr "¿Debería GNUnet conectarse exclusivamente a amigos?"
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr "Número mínimo de conexiones amistosas"
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr "La topología siempre debe ser cargada"
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 "¿Deberían habilitarse automáticamente durante el inicio las listas de "
 "máquinas?"
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 "¿Debería arrancarse automáticamente durante el inicio la compartición de "
 "ficheros?"
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 "GNUnet debería aprender acerca de otros pares usando listas de máquinas"
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr "GNUnet debería aprender listas de máquinas de otros pares"
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr "Este par debería ofrecer una lista de máquinas a otros pares"
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr "Este par debería anunciar su lista de máquinas a otros pares"
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 "Puerto en el que esta lista de máquinas debería ser ofrecida a los pares"
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr "URL de listas de máquinas conocidas"
 
-#: src/setup/gnunet-setup-options.c:1255
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1483
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr "¿Cuantos bytes por segundo podemos enviar?"
 
-#: src/setup/gnunet-setup-options.c:1267
+#: src/setup/gnunet-setup-options.c:1495
 msgid "How many bytes per second are we allowed to receive?"
 msgstr "¿Cuantos bytes por segundo podemos recibir?"
 
-#: src/setup/gnunet-setup-options.c:1281
+#: src/setup/gnunet-setup-options.c:1509
 msgid "Enable communication via TCP"
 msgstr "Activar comunicación vía TCP"
 
-#: src/setup/gnunet-setup-options.c:1293
+#: src/setup/gnunet-setup-options.c:1521
 msgid "Enable communication via UDP"
 msgstr "Activar comunicación vía UDP"
 
-#: src/setup/gnunet-setup-options.c:1305
+#: src/setup/gnunet-setup-options.c:1533
 msgid "Enable communication via HTTP as a server"
 msgstr "Activar comunicación vía HTTP como un servidor"
 
-#: src/setup/gnunet-setup-options.c:1317
+#: src/setup/gnunet-setup-options.c:1545
 msgid "Enable communication via HTTP as a client"
 msgstr "Activar comunicación vía HTTP como un cliente"
 
-#: src/setup/gnunet-setup-options.c:1329
+#: src/setup/gnunet-setup-options.c:1557
 msgid "Enable communication via HTTPS as a server"
 msgstr "Activar comunicación vía HTTPS como un servidor"
 
-#: src/setup/gnunet-setup-options.c:1341
+#: src/setup/gnunet-setup-options.c:1569
 msgid "Enable communication via HTTPS as a client"
 msgstr "Activar comunicación vía HTTPS como un cliente"
 
-#: src/setup/gnunet-setup-options.c:1353
+#: src/setup/gnunet-setup-options.c:1581
 msgid "Enable communication via DV"
 msgstr "Activar comunicación vía DV"
 
-#: src/setup/gnunet-setup-options.c:1365
+#: src/setup/gnunet-setup-options.c:1593
 msgid "Enable communication via WLAN"
 msgstr "Activar comunicación vía WLAN"
 
-#: src/setup/gnunet-setup-options.c:1377
+#: src/setup/gnunet-setup-options.c:1605
 msgid "Port we bind to for TCP"
 msgstr "Puerto al que nos asociamos para TCP"
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
 msgid "Port visible to other peers"
 msgstr "Puerto visible a otros pares"
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
-msgstr "Comprueba si este par está detrás de un NAT"
-
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
-msgstr ""
-"Comprueba si el NAT ha sido configurado manualmente para encaminar los "
-"puertos"
-
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
-msgstr "Activar recorrido NAT con UPnP/PMP"
-
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
-msgstr "Activar recorrido NAT con ICMP como servidor"
-
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
-msgstr "Dirección IP externa (pública) del NAT"
-
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
-msgstr "Activar recorrido NAT con ICMP como cliente"
-
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
-msgstr "Dirección IP interna (privada) del NAT"
-
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
-msgstr "Deshabilitar soporte IPv6"
-
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr "Puerto para paquetes UDP entrantes, use 0 si está detrás de un NAT"
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr "Puerto para conexiones HTTP entrantes, use 0 si está detrás de un NAT"
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr "Puerto para conexiones HTTPS entrantes, use 0 si está detrás de un NAT"
 
-#: src/setup/gnunet-setup-options.c:1574
-msgid "How many bytes are we allowed to store in the local datastore?"
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
 msgstr ""
-"¿Cuantos bytes podemos tener alojados en nuestro almacén de datos local?"
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
+msgid "How many bytes are we allowed to store in the local datastore?"
+msgstr ""
+"¿Cuantos bytes podemos tener alojados en nuestro almacén de datos local?"
+
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr "Usar sqLite para almacenar el contenido compartido"
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr "Usar MySQL para almacenar el contenido compartido"
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr "Usar Postgres para almacenar el contenido compartido"
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr "Nombre de la base de datos MySQL"
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 msgid "Configuration file for MySQL access"
 msgstr "Fichero de configuración para el acceso a MySQL"
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr "Usuario para el acceso a MySQL"
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr "Contraseña para el acceso a MySQL"
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr "Nombre de la máquina ejecutando la base de datos MySQL"
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr "Puerto de la base de datos MySQL"
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "Configuración para Postgres (pasada a «PQconnectdb»)"
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr "¿Deberíamos probar a subir nuestros contenidos a otros pares?"
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr "¿Podemos cachear el contenido recibido de otros pares?"
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr "¿Cuantos bytes podemos almacenar en la caché de datos local?"
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr "Usar sqLite para cachear los datos de la DHT"
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr "Usar la memoria para cachear los datos de la DHT"
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr "Usar Postgres para cachear los datos de la DHT"
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr "Nombre de la interfaz de monitorización a usar (monX)"
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+#, fuzzy
+msgid "Should the VPN be started automatically on startup?"
 msgstr "¿Debería arrancarse al inicio (automáticamente) la VPN/PT?"
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2180
+#, fuzzy
+msgid "Should the PT be started automatically on startup?"
+msgstr "¿Debería arrancarse al inicio (automáticamente) la VPN/PT?"
+
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr "Encaminar el tráfico IPv4 a través de GNUnet"
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr "Encaminar el tráfico IPv6 a través de GNUnet"
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr "Encaminar el tráfico DNS a través de GNUnet"
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr "Nombre de la interfaz virtual que la VPN de GNUnet debería crear"
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr "Dirección IPv4 a usar para la interfaz VPN"
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr "Máscara de red IPv4 a usar para la interfaz VPN"
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr "Dirección IPv6 a usar para la interfaz VPN"
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr "Longitud del prefijo de red IPv6 a usar para la interfaz VPN"
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
@@ -701,7 +1022,7 @@ msgstr ""
 "Activar la salida VPN para proveer servicios y/o para permitir a otros usar "
 "su conexión de internet"
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
@@ -709,14 +1030,14 @@ msgstr ""
 "Dirección IP del resolvedor DNS externo a usar (los valores de su resolve."
 "conf habitualmente son apropiados)"
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 "Permitir a otros pares realizar resoluciones DNS usando su conexión a "
 "Internet"
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
@@ -724,23 +1045,23 @@ msgstr ""
 "Nombre de la interfaz virtual que el servicio de salida GNUnet debe crear "
 "para el tráfico saliendo de la VPN a Internet"
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr "Dirección IPv4 a usar para la interfaz de salida"
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr "Máscara de red IPv4 a usar para la interfaz de salida"
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr "Dirección IPv6 a usar para la interfaz de salida"
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr "Longitud del prefijo de red IPv6 a usar para la interfaz de salida"
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
@@ -748,7 +1069,7 @@ msgstr ""
 "Permitir a otros usuarios usar su conexión de internet para tráfico UDP (vía "
 "la interfaz de salida)"
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
@@ -756,146 +1077,35 @@ msgstr ""
 "Permitir a otros usuarios usar su conexión de internet para tráfico TCP (vía "
 "la interfaz de salida)"
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr "Usar sqLite para almacenar nombres"
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr "Usar PostGres para almacenar nombres"
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr "¿Debería arrancarse al inicio (automáticamente) el GNS?"
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 #, fuzzy
 msgid "Specification of .gnunet hosted services"
 msgstr "Especificación del dominio superior (TLD) .gnunet"
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr "Recorrido NAT con servidor ICMP completado.\n"
-
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr "Recorrido NAT con servidor ICMP fallido.\n"
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr "Expiró el plazo del recorrido NAT con servidor ICMP.\n"
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr "Provando conexión inversa con servidor ICMP.\n"
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr "Detectada IP externa «%s»\n"
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr "Este sistema tiene una dirección IPv6 global, habilitando IPv6.\n"
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr "Detectada dirección de la red interna «%s».\n"
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr "«upnpc» encontrado, habilitando su uso\n"
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr "«upnpc» no encontrado\n"
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr "«gnunet-helper-nat-server» encontrado, probándolo\n"
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr "No se encontró un «gnunet-helper-nat-server» funcional\n"
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr "«gnunet-helper-nat-client» encontrado, habilitándolo\n"
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-"«gnunet-helper-nat-client» no encontrado o detrás de un NAT, "
-"deshabilitándolo\n"
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr "Expresión regular «%s» no válida\n"
-
-#: src/setup/gnunet-setup.c:227
-#, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr ""
-"Se produjo un fallo al obtener el valor de una opción del widget «%s»\n"
-
-#: src/setup/gnunet-setup.c:279
-#, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Se produjo un fallo al inicializar el widget «%s»\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-"No hay un valor predeterminado conocido para la opción «%s» en la sección "
-"«%s»\n"
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr "Se produjo un fallo al inicializar el widget «%s» con el valor «%s»\n"
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-"Introduzca SU contraseña para ejecutar «gnunet-setup» como usuario "
-"«gnunet» (asumiendo que 'sudo' lo permita)"
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "Acerca de «gnunet-peerinfo-gtk»"
-
-#: src/setup/gnunet-setup.c:631
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr "Probando configuración de red totalmente automática y no interactiva\n"
-
-#: src/setup/gnunet-setup.c:652
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr "probar configuración de red automática y salir instantaneamente"
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-"ejecutar como usuario «gnunet», si es necesario ejecutando «gksu» para "
-"obtener permiso"
-
 #: src/statistics/functions.c:519
 msgid "Connectivity"
 msgstr "Conectividad"
@@ -956,7 +1166,7 @@ msgstr "Efectividad del encaminamiento"
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr "Efectividad media (rojo) (100% = perfecto)"
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 "Se produjo un fallo al iniciar la conexión con el servicio de estadísticas\n"
@@ -966,6 +1176,21 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr "Conectado a %Lu pares"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+"La licencia debería ser cargada aquí en tiempo de ejecución del archivo de "
+"licencia (no hace falta tener una copia de la GPL completa aquí...)."
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -975,6 +1200,7 @@ msgstr "Conectado a %Lu pares"
 msgid "Developed by"
 msgstr "Desarrollado por"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -984,6 +1210,7 @@ msgstr "Desarrollado por"
 msgid "Documented by"
 msgstr "Documentado por"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -993,6 +1220,7 @@ msgstr "Documentado por"
 msgid "Translated by"
 msgstr "Traducido por"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -1002,6 +1230,7 @@ msgstr "Traducido por"
 msgid "Artwork by"
 msgstr "Trabajos artísticos de"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -1011,6 +1240,7 @@ msgstr "Trabajos artísticos de"
 msgid "Credits"
 msgstr "Créditos"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -1020,108 +1250,329 @@ msgstr "Créditos"
 msgid "License"
 msgstr "Licencia"
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Añadir _fichero"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr "_Ver"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+msgid "_Caller Identity"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
 msgstr ""
-"La licencia debería ser cargada aquí en tiempo de ejecución del archivo de "
-"licencia (no hace falta tener una copia de la GPL completa aquí...)."
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+msgid "<b>Caller Identity</b>"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "Estado"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+msgid "resume"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<b>Configuración del servicio</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
+msgstr "Objetivo:"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+#, fuzzy
+msgid "Terminate a conversation."
+msgstr "Probar configuración"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<b>Configuración de interfaz VPN</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Tipo"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "Nombre"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr "Valor"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+#, fuzzy
+msgid "Public?"
+msgstr "_Publicar"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<b>Tiempo de expiración</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Opciones</b>"
 
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr "Guardar fichero como..."
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Anonimato:"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 msgid "_recursive"
 msgstr "_recursivo"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "_General"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "Espacio de nombres:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 msgid "_Publication type:"
 msgstr "Tipo de _publicación:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 msgid "Preview:"
 msgstr "Previsualización:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "Palabra _clave:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 msgid "_Index file:"
 msgstr "_Fichero de índice:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 msgid "_Root keyword:"
 msgstr "Palabra clave _raíz:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 msgid "A_nonymity:"
 msgstr "A_nonimato:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr "Año de _expiración:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 msgid "_Replication:"
 msgstr "_Replicación:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 msgid "Publication options:"
 msgstr "Opciones de publicación:"
 
@@ -1130,44 +1581,198 @@ msgstr "Opciones de publicación:"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Introduce el nombre para el cual este nombre es un alias."
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "_Nombre:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
+msgid "Normal"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+#, fuzzy
+msgid "PDF documents"
+msgstr "Documentado por"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:371
+msgid "Copy selection"
+msgstr "Copiar colección"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 msgid "gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
+#: contrib/gnunet_fs_gtk_main_window.glade:438
 msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 msgid "_File sharing"
 msgstr "_Compartición de ficheros"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
+#: contrib/gnunet_fs_gtk_main_window.glade:483
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
+#: contrib/gnunet_fs_gtk_main_window.glade:486
 msgid "Publish files or directories on GNUnet"
 msgstr "Publicar ficheros o directorios en GNUnet"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 msgid "_List indexed files"
 msgstr "_Lista de ficheros indexados"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
+#: contrib/gnunet_fs_gtk_main_window.glade:515
 msgid "Download a file or directory with a known URI."
 msgstr "Descargar un fichero o directorio con una URI conocida."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
+#: contrib/gnunet_fs_gtk_main_window.glade:526
 msgid "_Open GNUnet directory"
 msgstr "_Abrir un directorio GNUnet"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_fs_gtk_main_window.glade:529
 msgid ""
 "Use this option to browse a GNUnet directory file that has been previously "
 "downloaded."
@@ -1175,299 +1780,134 @@ msgstr ""
 "Use esta opción para buscar un fichero de directorio GNUnet que ha sido "
 "previamente descargado."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_fs_gtk_main_window.glade:549
 msgid ""
 "Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 "Salir de «gnunet-fs-gtk».  Las operaciones de compartición de ficheros "
 "activas se retomarán al reinicio."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
+#: contrib/gnunet_fs_gtk_main_window.glade:564
 msgid "_Edit"
 msgstr "_Editar"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
+#: contrib/gnunet_fs_gtk_main_window.glade:575
 msgid "Edit the system configuration."
 msgstr "Editar la configuración del sistema."
 
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
-msgstr "_Ver"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:275
+#: contrib/gnunet_fs_gtk_main_window.glade:599
 msgid "Show meta data in main window"
 msgstr "Mostrar metadatos en la ventana principal"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
+#: contrib/gnunet_fs_gtk_main_window.glade:600
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
+#: contrib/gnunet_fs_gtk_main_window.glade:610
 msgid "Show preview (when available)"
 msgstr "Mostrar previsualización (cuando esté disponible)"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
+#: contrib/gnunet_fs_gtk_main_window.glade:611
 msgid "Preview"
 msgstr "Previsualización"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
+#: contrib/gnunet_fs_gtk_main_window.glade:621
 msgid "Show search box in main window"
 msgstr "Mostrar la caja de búsqueda en la ventana principal"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
-msgid "Search"
-msgstr "Buscar"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:323
-msgid "Display information about this version of gnunet-fs-gtk"
-msgstr "Mostrar información acerca de esta versión de «gnunet-fs-gtk»"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:354
-msgid "Namespace:"
-msgstr "Espacio de nombres:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:395
-msgid ""
-"Remember the specified namespace for later.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right."
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:415
-#, fuzzy
-msgid "Keywords:"
-msgstr "Palabra _clave:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:459
-msgid ""
-"Search using the given keywords.  The search may be narrowed by the given "
-"mime type and/or restricted to a namespace.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right.\n"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
-msgid "Anonymity:"
-msgstr "Anonimato:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:538
-msgid "Mime-type:"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
-#: contrib/gnunet_fs_gtk_search_tab.glade:104
-msgid "Status"
-msgstr "Estado"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:848
-msgid "Download into:"
-msgstr "Descargar en:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:862
-msgid "Select a directory to download into"
-msgstr "Seleccionar un directorio en el que descargar"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:888
-msgid "Download as:"
-msgstr "Descargar como:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:991
-msgid "Recursive"
-msgstr "Recursivo"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
-msgid "Download!"
-msgstr "¡Descargar!"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
-msgid "Thumbnail associated with the currently selected content"
-msgstr "Miniatura asociada con el contenido seleccionado actualmente"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
-#, fuzzy
-msgid "File meta data"
-msgstr "Metadatos"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
-msgid "Normal"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-#, fuzzy
-msgid "PDF documents"
-msgstr "Documentado por"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
+msgid "Search"
+msgstr "Buscar"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:647
+msgid "Display information about this version of gnunet-fs-gtk"
+msgstr "Mostrar información acerca de esta versión de «gnunet-fs-gtk»"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:679
+msgid "Namespace:"
+msgstr "Espacio de nombres:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
+#: contrib/gnunet_fs_gtk_main_window.glade:725
+msgid ""
+"Remember the specified namespace for later.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:746
+#, fuzzy
+msgid "Keywords:"
+msgstr "Palabra _clave:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
+#: contrib/gnunet_fs_gtk_main_window.glade:787
+msgid ""
+"Search using the given keywords.  The search may be narrowed by the given "
+"mime type and/or restricted to a namespace.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
+msgid "Anonymity:"
+msgstr "Anonimato:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
+#: contrib/gnunet_fs_gtk_main_window.glade:867
+msgid "Mime-type:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
+#: contrib/gnunet_fs_gtk_search_tab.glade:104
+msgid "Status"
+msgstr "Estado"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
+msgid "Download into:"
+msgstr "Descargar en:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
+msgid "Select a directory to download into"
+msgstr "Seleccionar un directorio en el que descargar"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
+msgid "Download as:"
+msgstr "Descargar como:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
+msgid "Recursive"
+msgstr "Recursivo"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
+msgid "Download!"
+msgstr "¡Descargar!"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
+msgid "Thumbnail associated with the currently selected content"
+msgstr "Miniatura asociada con el contenido seleccionado actualmente"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
-msgid "Copy selection"
-msgstr "Copiar colección"
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
+#, fuzzy
+msgid "File meta data"
+msgstr "Metadatos"
 
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 msgid "Enter the URI to be downloaded"
 msgstr "Introducir la URI a descargar"
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 msgid "_URI:"
 msgstr "_URI:"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 msgid "<b>Messages</b>"
 msgstr "<b>Mensajes</b>"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr "Preprocesando..."
 
@@ -1475,43 +1915,43 @@ msgstr "Preprocesando..."
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 msgid "Publish content on GNUnet"
 msgstr "Publicar contenido en GNUnet"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr "Añadir _fichero"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 msgid "_Create empty directory"
 msgstr "_Crear directorio vacío"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 msgid "Add _Directory"
 msgstr "Añadir _directorio"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr "_Izquierda"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr "_Derecha"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1519,11 +1959,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1542,18 +1982,18 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1562,35 +2002,35 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "Identificador"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 msgid "Identifier"
 msgstr "Identificador"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "Identificador"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 msgid "Make publication updateable"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1598,18 +2038,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "Identificador:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1617,15 +2057,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr "_Ejecutar"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr "Borrar todas las palabras _clave"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 #, fuzzy
 msgid ""
 "This button removes all keywords from all files and directories in this "
@@ -1644,44 +2084,71 @@ msgstr ""
 "este botón.  Fíjese que los metadatos no se ven afectados por usar esta "
 "función."
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
-msgid "Priority:"
-msgstr "Prioridad:"
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
+#, fuzzy
+msgid "Select directory to publish"
+msgstr "Seleccionar un directorio en el que descargar"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr "Año de expiración:"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+msgid "Priority:"
+msgstr "Prioridad:"
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 msgid "Index files"
 msgstr "Ficheros de índices"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 msgid "Publish file..."
 msgstr "Publicar fichero..."
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 msgid "Index file"
 msgstr "Fichero de índices"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 msgid "Progress"
 msgstr "Progreso"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 msgid "Publishing"
 msgstr "Publicación"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr "No deberías ver tampoco esto"
 
@@ -1689,47 +2156,52 @@ msgstr "No deberías ver tampoco esto"
 msgid "Indexed files"
 msgstr "Ficheros indexados"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 msgid "Unindex the selected indexed file."
 msgstr "Desindexar el fichero indexado seleccionado."
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 #, fuzzy
 msgid "gnunet-gtk"
 msgstr "«gnunet»"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "Estado"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "Compartición de fichero_s"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+#, fuzzy
+msgid "Voice conversation"
+msgstr "Probar configuración"
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuración:"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 msgid "Quit"
 msgstr "Salir"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1737,77 +2209,62 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "<b>Nombre</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 msgid "Type:"
 msgstr "Tipo:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "Valor"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Tipo"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
-msgstr "Valor"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "Nombre"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Opciones de compartición de ficheros</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 msgid "Execute advertisement."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Añadir _fichero"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "Identificador"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
@@ -1818,51 +2275,60 @@ msgstr ""
 "capacidad de cambiarlo posteriormente (en base a los valores de expiración "
 "seleccionados)."
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr "Nombre del registro en la zona."
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr "entrada"
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
@@ -1870,72 +2336,78 @@ msgstr ""
 "Seleccione la zona deseada para el registro.  Cambiar este valor aquí moverá "
 "el registro a la zona seleccionada."
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 msgid "<b>Name</b>"
 msgstr "<b>Nombre</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
 msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
 msgstr ""
-"Introduzca una dirección IPv4 para el registro A aquí. El formato es la "
-"notación punto-decimal habitual (por ejemplo 127.0.0.1)."
+"Introduzca una dirección IPv6 para el registro A aquí. El formato es la "
+"notación de dos puntos habitual (por ejemplo ::1)."
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
-msgstr "<b>Dirección IPv4 de destino</b>"
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
+msgstr "<b>Dirección IPv6 de destino</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
 msgid "Record is public (visible to other users)"
 msgstr "El registro es público (visible para otros usuarios)"
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
+#: contrib/gnunet_namestore_edit_aaaa.glade:267
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+#, fuzzy
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
 msgstr ""
 "Aunque se recomienda que los registros «privados» estén en la «zona "
 "privada», se tiene total libertada para marcar registros en otras zonas como "
@@ -1944,37 +2416,43 @@ msgstr ""
 "importante, si su registro está fijado a no expirar nunca, nunca podrá "
 "cambiar el mapeado en el futuro si el registro es público."
 
-#: contrib/gnunet_namestore_edit_a.glade:285
-#: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
 msgid "Record is a shadow record (valid after other records expire)"
 msgstr ""
 "El registro es un registro fantasma (válido después de que otros registros "
 "expiren)"
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
 msgid ""
 "A shadow record is a record which becomes valid in the future.  They are not "
 "used as long as a second non-expired record with the same name and type "
@@ -1992,51 +2470,60 @@ msgstr ""
 "es válido hasta media noche, y uno fantasma que se vuelve válido a media "
 "noche."
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
 msgid "<b>Options</b>"
 msgstr "<b>Opciones</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
 msgid "Relative"
 msgstr "Relativo"
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
 msgid ""
 "Records with a relative expiration time (such as 1 week) are always valid "
 "for at least that time period into the future. In other words, the auto-"
@@ -2055,35 +2542,41 @@ msgstr ""
 "futuro. Use tiempos de expiración relativos para entradas de kas cuales no "
 "conoce una fecha específica en la que expirarán."
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
 msgid "Absolute"
 msgstr "Absoluto"
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
 msgid ""
 "Records with an absolute expiration time are valid until the specified date. "
 "You can change that date to an even later date, but you cannot set it to an "
@@ -2098,35 +2591,41 @@ msgstr ""
 "absolutas si sabe que un registro particular va a ser válido únicamente "
 "hasta un día preciso."
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
 msgid "Never"
 msgstr "Nunca"
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
 msgid ""
 "Records can be set to be valid forever. This is great if you are worried "
 "about censorship or certain that the mapping will never change.  Note that "
@@ -2139,19 +2638,22 @@ msgstr ""
 "posteriormente (puesto que otros usuarios son libres de cachear el valor "
 "antiguo para siempre)."
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
 msgid ""
 "Select the date on which you want this record to expire. At that date, you "
 "can then create a new mapping or have a shadow record go automatically into "
@@ -2163,115 +2665,136 @@ msgstr ""
 "efecto.  Fíjese que para los registros públicos no se puede cambiar el "
 "tiempo de expiración a una fecha anterior después de hacerlo efectivo."
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
 msgid "Hours:"
 msgstr "Horas:"
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
 msgid "Which hour of the day selected above should the record expire?"
 msgstr "¿A qué hora del día seleccionado debería expirar el registro?"
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
 msgid "Minutes:"
 msgstr "Minutos:"
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
 msgid "Which minute of the day selected above should the record expire?"
 msgstr "¿En qué minuto del día seleccionado debería expirar el registro?"
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
 msgid "Seconds:"
 msgstr "Segundos:"
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
 msgid "Which second of the day selected above should the record expire?"
 msgstr "¿En qué segundo del día seleccionado debería expirar el registro?"
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
 msgid ""
 "Relative expiration time of the record.  The syntax is a number followed by "
 "a space and a time unit, possibly followed by additional numbers and time "
@@ -2287,55 +2810,259 @@ msgstr ""
 "es posible editar ahora mismo debido a que Gtk2 y Gtk3 tienen modos "
 "incompatibles de hacerlo)."
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
 msgid "<b>Expiration Time</b>"
 msgstr "<b>Tiempo de expiración</b>"
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
 msgstr ""
-"Introduzca una dirección IPv6 para el registro A aquí. El formato es la "
-"notación de dos puntos habitual (por ejemplo ::1)."
+"Introduzca una dirección IPv4 para el registro A aquí. El formato es la "
+"notación punto-decimal habitual (por ejemplo 127.0.0.1)."
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
-msgstr "<b>Dirección IPv6 de destino</b>"
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr "<b>Dirección IPv4 de destino</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+#, fuzzy
+msgid "_Port:"
+msgstr "Puerto:"
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr "Peso:"
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr "Puerto:"
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr "Prioridad del objetivo, valores menores significan mayor preferencia"
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr "Peso relativo para registros de la misma prioridad"
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr "Puerto TCP o UDP donde se encontrará el servicio"
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr "Nombre canónico de máquina del equipo que provee el servicio"
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+msgid "<b>Service record (SRV)</b>"
+msgstr "<b>Registro de servicio (SRV)</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
+#, fuzzy
+msgid "Selector:"
+msgstr "Seleccionar fichero"
+
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
+#, fuzzy
+msgid "Certificate:"
+msgstr "Identificador:"
+
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:821
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
+#, fuzzy
+msgid "<b>TLSA Record Information</b>"
+msgstr "<b>Configuración del servicio</b>"
+
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:329
+msgid ""
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "<b>Nombre</b>"
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr "Introduce el nombre para el cual este nombre es un alias."
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr "<b>Nombre canónico (CNAME)</b>"
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 #, fuzzy
 msgid "<b>Name of the target DNS domain</b>"
 msgstr "<b>Información de Inicio de Autoridad (SOA en inglés)</b>"
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2345,11 +3072,11 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr "<b>Nombre del servidor de nombres autoritativo para el nombre dado</b>"
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
@@ -2357,19 +3084,19 @@ msgstr ""
 "Introduzca el nombre de DNS bajo el cual este sistema es alcanzable usando "
 "el DNS tradicional."
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr "<b>Nombre de máquina antiguo en DNS (LEHO)</b>"
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr "Introduzca el nombre de máquina del servidor de correo aquí"
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr "distancia"
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
@@ -2377,7 +3104,7 @@ msgstr ""
 "Introduzca el número de preferencia (o distancia, ya que valores menores son "
 "preferidos) del servidor de correo dado aquí"
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr "<b>Registro de intercambio de correo (MX)</b>"
 
@@ -2385,162 +3112,143 @@ msgstr "<b>Registro de intercambio de correo (MX)</b>"
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "Par:"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 #, fuzzy
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 "Introduzca la identidad (gnunet-peerinfo -s) del para que ofrece el servicio "
 "aquí."
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 #, fuzzy
 msgid "Enter the phone line used for the user at the peer here."
 msgstr "Introduzca el nombre de máquina del servidor de correo aquí"
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Registro de servicio (SRV)</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 #, fuzzy
 msgid "Enter the public key of the authority here."
 msgstr "Introduzca el hash de la clave pública de la autoridad aquí."
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 #, fuzzy
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr "<b>Autoridad GADS para la subzona (PKEY)</b>"
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr "<b>Nombre canónico (PTR)</b>"
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr "Máquina fuente:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr "Correo de contacto:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr "Número de serie:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr "Tiempo de refresco:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr "Tiempo de reintento:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr "Tiempo de expiración:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr "TTL mínimo:"
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr "Este número debe ser incrementado para cada actualización de zona."
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr "El valor es en segundos."
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr "Nombre de la máquina responsable de la zona."
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr "¡Fíjese que se usa un «.» en vez de address@hidden en la dirección de 
correo!"
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr "<b>Información de Inicio de Autoridad (SOA en inglés)</b>"
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr "Peso:"
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr "Puerto:"
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr "Objetivo:"
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
-msgstr "Prioridad del objetivo, valores menores significan mayor preferencia"
-
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
-msgstr "Peso relativo para registros de la misma prioridad"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
-msgstr "Puerto TCP o UDP donde se encontrará el servicio"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
-msgstr "Nombre canónico de máquina del equipo que provee el servicio"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-msgid "<b>Service record (SRV)</b>"
-msgstr "<b>Registro de servicio (SRV)</b>"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr "<b>Valor textual (TXT)</b>"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr "Protocolo:"
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 msgid "Peer:"
 msgstr "Par:"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr "TCP"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr "El servicio está disponible vía TCP"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr "UDP"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr "El servicio está disponible vía UDP"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
@@ -2548,7 +3256,7 @@ msgstr ""
 "Introduzca la identidad (gnunet-peerinfo -s) del para que ofrece el servicio "
 "aquí."
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
@@ -2558,40 +3266,87 @@ msgstr ""
 "contraseña) que puede ser libremente seleccionado por el proveedor de "
 "servicio.  Esta cadena debe ser introducida aquí."
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 #, fuzzy
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr "<b>Dirección VPN de GNUnet (únicamente GADS)</b>"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr "Editar entrada GNS"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+msgid "Edit"
+msgstr "Editar"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "«gnunet-statistics-gtk»"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr "<b>FIJAR A LA CLAVE PÚBLICA DE LA ZONA</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
+msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
 #, fuzzy
-msgid "Preferred zone name (NICK):"
-msgstr "Nombre de zona preferido (PSEU):"
+msgid " _Select Zone"
+msgstr "Seleccionar fichero"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 msgid "QR code for the selected zone"
 msgstr "Código QR para la zona seleccionada"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr "<b><big>Cargando...</big></b>"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
-msgstr "Editar entrada GNS"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+#, fuzzy
+msgid "  _Edit Zone "
+msgstr "Zona _privada"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-msgid "Edit"
-msgstr "Editar"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr "<b>FIJAR A LA CLAVE PÚBLICA DE LA ZONA</b>"
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 msgid "About gnunet-peerinfo-gtk"
@@ -2934,65 +3689,60 @@ msgstr ""
 "Traducido por:\n"
 "Miguel Ángel Arruga Vivas <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 msgid "Address valid?"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 msgid "gnunet-peerinfo-gtk"
 msgstr "«gnunet-peerinfo-gtk»"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr "Muestra información acerca de esta versión de «gnunet-peerinfo-gtk»"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 #, fuzzy
 msgid "Friend"
 msgstr "Fichero de amigos:"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "Estado"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 msgid "About gnunet-setup"
 msgstr "Acerca de «gnunet-setup»"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 msgid "gnunet-setup"
 msgstr "«gnunet-setup»"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr "Servicios:"
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr "Topología"
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
@@ -3000,11 +3750,11 @@ msgstr ""
 "El subsistema de topología es necesario ya que asegura que su par se conecte "
 "a otros pares."
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr "Lista de máquinas"
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
@@ -3014,25 +3764,36 @@ msgstr ""
 "Aquí puede seleccionar si ofrecer una lista de máquinas o simplemente "
 "configurar que listas de máquinas de otros pares se desean usar."
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 msgid "File _Sharing"
 msgstr "Compartición de fichero_s"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr "Activar el subsistema de compartición de ficheros de GNUnet."
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
-msgstr "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+#, fuzzy
+msgid "VPN"
+msgstr "_VPN"
+
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:495
+#, fuzzy
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 "A través de los subsistemas PT/VPN usted puede encaminar su tráfico de "
 "internet a través de GNUnet.  Esto es útil si quiere acceder a Internet IPv4 "
@@ -3040,11 +3801,11 @@ msgstr ""
 "conectado únicamente a otros pares usando WLAN, se puede obtener acceso "
 "directo a Internet encaminando el tráfico IP a través de GNUnet."
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr "SALIDA"
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3063,11 +3824,11 @@ msgstr ""
 "servidores únicamente IPv4 desde clientes únicamente IPv6 y acceder a "
 "servidores únicamente IPv6 desde clientes únicamente IPv4."
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr "GNS"
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
@@ -3077,251 +3838,213 @@ msgstr ""
 "disponible el dominio TLD «.gnunet» en su sistema.  Usted está a cargo de su "
 "dominio TLD «.gnunet»."
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Configuración del servicio</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 msgid "F_2F only"
 msgstr "F_2F únicamente"
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 msgid "Min. connected friends:"
 msgstr "Mín. de amigos conectados"
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 "<b>Configuración F2F (Amigo a amigo) (restringe las conexiones P2P)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "_General"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr "Usar la lista de máquinas para inicializar"
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr "Aprender servidores de la red P2P"
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr "Ejecutar el servidor de listas de máquinas"
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr "Anunciar el servidor de listas de máquinas"
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr "Lista de servidores de listas de máquinas conocidos:"
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr "<b>Configuración de listas de máquinas (para inicializar la red)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "_General"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr "Ancho de banda de descarga máximo (B/s):"
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr "Ancho de banda de subida máximo (B/s)"
-
-#: contrib/gnunet_setup_main_window.glade:733
-msgid "<b>Bandwidth Configuration</b>"
-msgstr "<b>Configuración de ancho de banda</b>"
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr "El par está detrás de un _NAT"
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
+#, fuzzy
+msgid "_Proxy type:"
+msgstr "Tipo de _publicación:"
 
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
-"Marque esta casilla si su máquina está detrás de una caja NAT (un router que "
-"realiza traducción de direcciones de red).  Desmárquela en el caso de que su "
-"máquina tenga una dirección global única IPv4.  Las opciones de NAT "
-"únicamente afectan a las direcciones IPv4 en este momento."
 
-#: contrib/gnunet_setup_main_window.glade:783
-msgid "Attempt automatic configuration"
-msgstr "Intentar configuración automática"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
-msgstr "Deshabilitar el soporte IPv_6"
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
-"Deshabilita el anuncio de direcciones IPv6. Marque esta casilla si sabe que "
-"su sistema no tiene conectividad IPv6 a Internet."
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
-msgstr "Puertos abiertos manualmente en el NAT"
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
-"Fije esta opción si ha configurado su NAT para encaminar los puertos para "
-"los distintos transportes habilitados de GNUnet.  Si los puertos externos "
-"son diferentes, los valores respectivos de los puertos externos deben ser "
-"especificados en «puerto anunciado» para el transporte respectivo. También "
-"debe especificar la «Dirección externa (pública) IPv4» de su NAT."
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
-msgstr "Activar recorrido NAT vía UPnP o PMP"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
+msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
-"Esta opción habilita el uso de «upnpc» desde «miniupnpd» para el recorrido "
-"NAT"
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
-msgstr "Activar recorrido NAT usando método ICMP"
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "Nombre de usuario:"
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
-"Esta opción habilita el uso del método «Recorrido autónomo NAT» (presentado "
-"en P2P 2010).  Requiere que «gnunet-helper-nat-server» esté instalado con el "
-"bit SUID activado en el sistema local."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+#, fuzzy
+msgid "Proxy password:"
+msgstr "Contraseña:"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
-msgstr ""
-"Dirección IP visible globalmente de su sistema (dirección IP de la interfaz "
-"externa de su NAT).  También puede especificar un nombre de máquina, en cuyo "
-"caso GNUnet periódicamente buscará el nombre de máquina en el DNS para "
-"determinar nuestra dirección IP externa (configurada por DynDNS, por "
-"ejemplo)."
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<b>Configuración de transporte</b>"
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr "Dirección externa (pública) IPv4:"
+#: contrib/gnunet_setup_main_window.glade:1248
+#, fuzzy
+msgid "_Hostlist"
+msgstr "Lista de máquinas"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
-msgstr "Habilitar conexión a pares detrás de un NAT usando el método ICMP"
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
+msgstr "Ancho de banda de descarga máximo (B/s):"
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
-msgstr ""
-"Este método permite a este par iniciar conexiones a pares detrás de un NAT "
-"usando el método «Recorrido autónomo NAT» (presentado en P2P 2010). Requiere "
-"tener «gnunet-helper-nat-client» instalado con el bit SUID activado en el "
-"sistema local."
+#: contrib/gnunet_setup_main_window.glade:1294
+#, fuzzy
+msgid "Max. upload bandwidth (B/s):"
+msgstr "Ancho de banda de subida máximo (B/s)"
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
-"Especificar la dirección IPv4 de la interfaz de red principal de sus "
-"ordenadores (habitualmente eth0 o wlan0)."
-
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
-msgstr "Dirección interna (privada) IPv4_"
 
-#: contrib/gnunet_setup_main_window.glade:1018
-msgid "<b>NAT Traversal Configuration</b>"
-msgstr "<b>Configuraciópn de recorrido NAT</b>"
+#: contrib/gnunet_setup_main_window.glade:1343
+msgid "<b>Bandwidth Configuration</b>"
+msgstr "<b>Configuración de ancho de banda</b>"
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr "_Red"
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr "Módulos a usar:"
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr "_TCP"
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr "_UDP"
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr "C_liente HTTP"
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr "S_ervidor HTTP"
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr "_Cliente HTTPS"
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr "_Servidor HTTPS"
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr "D_V"
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr "_WLAN"
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr "Asociar al puerto:"
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr "Use el puerto «0» para permitir únicamente conexiones TCP salientes"
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr "Puerto anunciado:"
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
@@ -3329,21 +4052,21 @@ msgstr ""
 "Puerto externo visible en nuestra dirección IP pública después de ser "
 "mapeado por cortafuegos/NAT"
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 msgid "Test configuration"
 msgstr "Probar configuración"
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
@@ -3354,179 +4077,224 @@ msgstr ""
 "sistema.  Esta prueba únicamente funciona si no está ejecutando su par a la "
 "vez que ejecuta la prueba."
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr "¡La configuración funciona!"
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr "¡Prueba fallida!"
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 "Número de puerto al que el transporte UDP de GNUnet se asociará en el "
 "sistema local"
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
-msgstr "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+#, fuzzy
+msgid "HTTP-Server"
+msgstr "S_ervidor HTTP"
+
+#: contrib/gnunet_setup_main_window.glade:2424
+#, fuzzy
+msgid "HTTP-Client"
+msgstr "C_liente HTTP"
+
+#: contrib/gnunet_setup_main_window.glade:2625
+#, fuzzy
+msgid "HTTPS-Server"
+msgstr "_Servidor HTTPS"
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
-msgstr "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2891
+#, fuzzy
+msgid "HTTPS-Client"
+msgstr "_Cliente HTTPS"
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr "DV"
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr "Nombre de la interfaz de _monitorización"
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr "WLAN"
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Configuración de transporte</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr "_Transportes"
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr "Activar transmisión de contenido no solicitado desde este par"
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr "Activar el cacheo de contenido en este par"
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Opciones de compartición de ficheros</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr "Base de datos a usar:"
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr "sqLite"
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr "MySQL"
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 msgid "Postgres"
 msgstr "Postgres"
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr "Cuota (bytes):"
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr "No se requiere configuración."
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr "Nombre de base de datos MySQL:"
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 msgid "gnunet"
 msgstr "«gnunet»"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 msgid "Configuration file:"
 msgstr "Fichero de configuración:"
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr "Nombre de máquina del servidor MySQL"
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr "localhost"
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr "¡Error de configuración!"
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 msgid "Configuration:"
 msgstr "Configuración:"
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr "<b>Configurar el almacén de datos (almacenamiento persistente)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr "Caché de datos:"
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr "Memoria"
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr "<b>Configurar caché de datos (almacenamiento temporal)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 msgid "_File Sharing"
 msgstr "Compartición de _ficheros"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr "Nombre de _interfaz:"
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+"Nombre de la interfaz TUN que GNUnet creará para interceptar el trafico "
+"saliente a Internet desde su máquina.  El predeterminado «gnunet-vpn» casi "
+"siempre está bien."
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr "Dirección IPv4 para la interfaz:"
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr "/"
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr "Dirección IPv6 para la interfaz:"
+
+#: contrib/gnunet_setup_main_window.glade:4184
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<b>Configuración de interfaz VPN</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr "Encaminar tráfico IPv4"
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3538,11 +4306,11 @@ msgstr ""
 "otros pares GNUnet observar su tráfico de Internet no encriptado. Esto "
 "habilita el tunelizado 4sobre6 y la traducción de protocolo 4a6."
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr "Encaminar tráfico IPv6"
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3554,11 +4322,11 @@ msgstr ""
 "otros pares GNUnet observar su tráfico de Internet no encriptado. Esto "
 "habilita el tunelizado 6sobre4 y la traducción de protocolo 6a4."
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 msgid "Tunnel DNS Traffic"
 msgstr "Encaminar tráfico DNS"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3577,44 +4345,11 @@ msgstr ""
 "un proxy de un salto en el caso peor, por lo que no provee de anonimato "
 "fuerte)."
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Configuración de traducción de protocolos y encaminamiento</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr "Nombre de _interfaz:"
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-"Nombre de la interfaz TUN que GNUnet creará para interceptar el trafico "
-"saliente a Internet desde su máquina.  El predeterminado «gnunet-vpn» casi "
-"siempre está bien."
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr "Dirección IPv4 para la interfaz:"
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr "/"
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr "Dirección IPv6 para la interfaz:"
-
-#: contrib/gnunet_setup_main_window.glade:3486
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<b>Configuración de interfaz VPN</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
@@ -3622,19 +4357,20 @@ msgstr ""
 "Configuración de las herramientas de GNUnet de VPN y traducción de "
 "protocolos (6a4, 4a6, 6sobre4, 4sobre6)"
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+#, fuzzy
+msgid "_VPN/PT"
 msgstr "_VPN"
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr "Activar salida DNS"
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr "Activar salida IPv4"
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
@@ -3642,11 +4378,11 @@ msgstr ""
 "Esta opción permitirá a otros pares mandar a Internet tráfico IPv4 usando su "
 "conexión de red."
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr "Activar salida IPv6"
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
@@ -3656,15 +4392,15 @@ msgstr ""
 "conexión de red.  Debe estar seguro de que el soporte IPv6 está habilitado "
 "antes de habilitar esta opción."
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr "Dirección IP del resolvedor externo DNS:"
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr "Nombre de la interfaz de salida:"
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
@@ -3673,11 +4409,11 @@ msgstr ""
 "saliente de GNUnet vía su propia máquina.  El predeterminado «gnunet-exit» "
 "está casi siempre bien."
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr "Dirección IPv4 de la interfaz de salida:"
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
@@ -3687,11 +4423,11 @@ msgstr ""
 "existente (por ejemplo algo como 10.50.0.1/255.255.0.0 o "
 "192.168.0.1/255.255.0.0)."
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr "Dirección IPv6 de la interfaz de salida:"
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
@@ -3701,65 +4437,61 @@ msgstr ""
 "Alternativamente, si su núcleo soporta IPv6-NAT, puede escoger cualquier "
 "prefijo del nombre local y configurar manualmente IPv6-NAT."
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Configuración de salida GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<b>Tiempo de expiración</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "Identificador"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 #, fuzzy
 msgid "_Port"
 msgstr "Puerto:"
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "_Replicación:"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr "S_alida"
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr "<b>Configurar el almacén de nombres (almacenamiento persistente)</b>"
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr "<b>Configurar el sistema de nombrado de GNUnet (GNS)</b>"
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 msgid "GNS & N_amestore"
 msgstr "GNS y _almacén de nombres"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 msgid "Welcome to gnunet-setup."
 msgstr "Bienvenido a la configuración de gnunet, «gnunet-setup»."
 
@@ -3767,11 +4499,11 @@ msgstr "Bienvenido a la configuración de gnunet, 
«gnunet-setup»."
 msgid "About gnunet-statistics-gtk"
 msgstr "Acerca de «gnunet-statistics-gtk»"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 msgid "gnunet-statistics-gtk"
 msgstr "«gnunet-statistics-gtk»"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr "Muestra información acerca de esta versión de «gnunet-statistics-gtk»"
 
@@ -3779,14 +4511,228 @@ msgstr "Muestra información acerca de esta versión de 
«gnunet-statistics-gtk
 msgid "_Connections"
 msgstr "_Conexiones"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 msgid "_Traffic"
 msgstr "_Tráfico"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr "_Almacenamiento"
 
+#~ msgid "start in tray mode"
+#~ msgstr "arrancar en la bandeja del sistema"
+
+#~ 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.  Fije la variable de "
+#~ "entorno «%s».\n"
+
+#, fuzzy
+#~ msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+#~ msgstr ""
+#~ "Nombre «%s» no válido para GADS/DNS (¿demasiado largo para una etiqueta "
+#~ "DNS?)\n"
+
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<b>Editando zona %s</b>"
+
+#~ msgid "Check if this peer is behind a NAT"
+#~ msgstr "Comprueba si este par está detrás de un NAT"
+
+#~ msgid "Check if the NAT has been configured manually to forward ports"
+#~ msgstr ""
+#~ "Comprueba si el NAT ha sido configurado manualmente para encaminar los "
+#~ "puertos"
+
+#~ msgid "Enable NAT traversal with UPnP/PMP"
+#~ msgstr "Activar recorrido NAT con UPnP/PMP"
+
+#~ msgid "Enable NAT traversal with ICMP as server"
+#~ msgstr "Activar recorrido NAT con ICMP como servidor"
+
+#~ msgid "External (public) IP address of the NAT"
+#~ msgstr "Dirección IP externa (pública) del NAT"
+
+#~ msgid "Enable NAT traversal with ICMP as client"
+#~ msgstr "Activar recorrido NAT con ICMP como cliente"
+
+#~ msgid "Internal (private) IP address of the NAT"
+#~ msgstr "Dirección IP interna (privada) del NAT"
+
+#~ msgid "Disable IPv6 support"
+#~ msgstr "Deshabilitar soporte IPv6"
+
+#~ msgid "NAT traversal with ICMP Server succeeded.\n"
+#~ msgstr "Recorrido NAT con servidor ICMP completado.\n"
+
+#~ msgid "NAT traversal with ICMP Server failed.\n"
+#~ msgstr "Recorrido NAT con servidor ICMP fallido.\n"
+
+#~ msgid "NAT traversal with ICMP Server timed out.\n"
+#~ msgstr "Expiró el plazo del recorrido NAT con servidor ICMP.\n"
+
+#~ msgid "Testing connection reversal with ICMP server.\n"
+#~ msgstr "Provando conexión inversa con servidor ICMP.\n"
+
+#~ msgid "Detected external IP `%s'\n"
+#~ msgstr "Detectada IP externa «%s»\n"
+
+#~ msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#~ msgstr "Este sistema tiene una dirección IPv6 global, habilitando IPv6.\n"
+
+#~ msgid "Detected internal network address `%s'.\n"
+#~ msgstr "Detectada dirección de la red interna «%s».\n"
+
+#~ msgid "upnpc found, enabling its use\n"
+#~ msgstr "«upnpc» encontrado, habilitando su uso\n"
+
+#~ msgid "upnpc not found\n"
+#~ msgstr "«upnpc» no encontrado\n"
+
+#~ msgid "gnunet-helper-nat-server found, testing it\n"
+#~ msgstr "«gnunet-helper-nat-server» encontrado, probándolo\n"
+
+#~ msgid "No working gnunet-helper-nat-server found\n"
+#~ msgstr "No se encontró un «gnunet-helper-nat-server» funcional\n"
+
+#~ msgid "gnunet-helper-nat-client found, enabling it\n"
+#~ msgstr "«gnunet-helper-nat-client» encontrado, habilitándolo\n"
+
+#~ msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#~ msgstr ""
+#~ "«gnunet-helper-nat-client» no encontrado o detrás de un NAT, "
+#~ "deshabilitándolo\n"
+
+#~ msgid "Attempting fully-automatic, non-interactive network configuration\n"
+#~ msgstr ""
+#~ "Probando configuración de red totalmente automática y no interactiva\n"
+
+#~ msgid "attempt automatic configuration of the network and instantly exit"
+#~ msgstr "probar configuración de red automática y salir instantaneamente"
+
+#, fuzzy
+#~ msgid "Preferred zone name (NICK):"
+#~ msgstr "Nombre de zona preferido (PSEU):"
+
+#~ msgid "PT/VPN"
+#~ msgstr "PT/VPN"
+
+#~ msgid "Peer is behind _NAT"
+#~ msgstr "El par está detrás de un _NAT"
+
+#~ msgid ""
+#~ "Check this box if your machine is behind a NAT box (router that performs "
+#~ "network address translation).  Leave off if your machine has a globally "
+#~ "unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#~ msgstr ""
+#~ "Marque esta casilla si su máquina está detrás de una caja NAT (un router "
+#~ "que realiza traducción de direcciones de red).  Desmárquela en el caso de "
+#~ "que su máquina tenga una dirección global única IPv4.  Las opciones de "
+#~ "NAT únicamente afectan a las direcciones IPv4 en este momento."
+
+#~ msgid "Attempt automatic configuration"
+#~ msgstr "Intentar configuración automática"
+
+#~ msgid "Disable IPv_6 support"
+#~ msgstr "Deshabilitar el soporte IPv_6"
+
+#~ msgid ""
+#~ "Disable advertising IPv6 addresses. Check this box if you know that your "
+#~ "system has no IPv6 Internet connectivity."
+#~ msgstr ""
+#~ "Deshabilita el anuncio de direcciones IPv6. Marque esta casilla si sabe "
+#~ "que su sistema no tiene conectividad IPv6 a Internet."
+
+#~ msgid "NAT ports have been opened manually"
+#~ msgstr "Puertos abiertos manualmente en el NAT"
+
+#~ msgid ""
+#~ "Set this option if you have configured your NAT to forward the ports for "
+#~ "the various enabled GNUnet transports.  If the external ports are "
+#~ "different, the respective values of the external port should be specified "
+#~ "under \"advertised port\" for the respective transport. You also need to "
+#~ "specify the \"External (public) IPv4 address\" of your NAT box below."
+#~ msgstr ""
+#~ "Fije esta opción si ha configurado su NAT para encaminar los puertos para "
+#~ "los distintos transportes habilitados de GNUnet.  Si los puertos externos "
+#~ "son diferentes, los valores respectivos de los puertos externos deben ser "
+#~ "especificados en «puerto anunciado» para el transporte respectivo. "
+#~ "También debe especificar la «Dirección externa (pública) IPv4» de su NAT."
+
+#~ msgid "Enable NAT traversal via UPnP or PMP"
+#~ msgstr "Activar recorrido NAT vía UPnP o PMP"
+
+#~ msgid ""
+#~ "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#~ msgstr ""
+#~ "Esta opción habilita el uso de «upnpc» desde «miniupnpd» para el "
+#~ "recorrido NAT"
+
+#~ msgid "Enable NAT traversal using ICMP method"
+#~ msgstr "Activar recorrido NAT usando método ICMP"
+
+#~ msgid ""
+#~ "This option enables the use of the \"Autonomous NAT Traversal\" method "
+#~ "(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
+#~ "installed SUID on the local system."
+#~ msgstr ""
+#~ "Esta opción habilita el uso del método «Recorrido autónomo "
+#~ "NAT» (presentado en P2P 2010).  Requiere que «gnunet-helper-nat-server» "
+#~ "esté instalado con el bit SUID activado en el sistema local."
+
+#~ msgid ""
+#~ "Globally visible IP address of your system (IP address of the external "
+#~ "interface of your NAT).  You can also specify a hostname, in which case "
+#~ "GNUnet will periodically look up the hostname in DNS to determine our "
+#~ "external IP address (DynDNS setup)."
+#~ msgstr ""
+#~ "Dirección IP visible globalmente de su sistema (dirección IP de la "
+#~ "interfaz externa de su NAT).  También puede especificar un nombre de "
+#~ "máquina, en cuyo caso GNUnet periódicamente buscará el nombre de máquina "
+#~ "en el DNS para determinar nuestra dirección IP externa (configurada por "
+#~ "DynDNS, por ejemplo)."
+
+#~ msgid "External (public) IPv4 address:"
+#~ msgstr "Dirección externa (pública) IPv4:"
+
+#~ msgid "Enable connecting to NATed peers using ICMP method"
+#~ msgstr "Habilitar conexión a pares detrás de un NAT usando el método ICMP"
+
+#~ msgid ""
+#~ "This method allows this peer to initiate connections to NATed peers using "
+#~ "the 'Autonomous NAT traversal' method (presented at P2P 2010). It "
+#~ "requires having gnunet-helper-nat-client installed SUID on the local "
+#~ "system."
+#~ msgstr ""
+#~ "Este método permite a este par iniciar conexiones a pares detrás de un "
+#~ "NAT usando el método «Recorrido autónomo NAT» (presentado en P2P 2010). "
+#~ "Requiere tener «gnunet-helper-nat-client» instalado con el bit SUID "
+#~ "activado en el sistema local."
+
+#~ msgid ""
+#~ "Specify the IPv4 address of your computers main network interface "
+#~ "(typically eth0 or wlan0)."
+#~ msgstr ""
+#~ "Especificar la dirección IPv4 de la interfaz de red principal de sus "
+#~ "ordenadores (habitualmente eth0 o wlan0)."
+
+#~ msgid "Internal (private) IPv4 address:"
+#~ msgstr "Dirección interna (privada) IPv4_"
+
+#~ msgid "<b>NAT Traversal Configuration</b>"
+#~ msgstr "<b>Configuraciópn de recorrido NAT</b>"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "HTTPS"
+#~ msgstr "HTTPS"
+
+#~ msgid "<b>Configure GNUnet Naming System</b>"
+#~ msgstr "<b>Configurar el sistema de nombrado de GNUnet (GNS)</b>"
+
 #~ msgid "Failed to initialize communication with peerinfo service!\n"
 #~ msgstr ""
 #~ "¡Se produjo un fallo al inicializar la comunicación con el servicio de "
@@ -3827,9 +4773,6 @@ msgstr "_Almacenamiento"
 #~ msgid "Invalid pseudonym specified for zone"
 #~ msgstr "Seudónimo no válido especificado para la zona"
 
-#~ msgid "Failed to commit record to database"
-#~ msgstr "Se produjo un fallo al guardar el registro en la base de datos"
-
 #~ msgid "Internal error"
 #~ msgstr "Error interno"
 
@@ -4004,9 +4947,6 @@ msgstr "_Almacenamiento"
 #~ msgid "_Master Zone"
 #~ msgstr "_Zona principal"
 
-#~ msgid "_Private Zone"
-#~ msgstr "Zona _privada"
-
 #~ msgid "_Shorten Zone"
 #~ msgstr "Zona _acortada"
 
diff --git a/po/fr.po b/po/fr.po
index b194b964..3c1cfcd4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2009-12-29 22:49+0100\n"
 "Last-Translator: Milan Bouchet-Valat <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -17,30 +17,182 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Sélectionner tous les fichiers"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "URI invalide : « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "URI invalide : « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "URI invalide : « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, fuzzy, c-format
+msgid "Adding contact failed: %s\n"
+msgstr "Erreur lors de la publication du fichier : %s"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "Impossible de créer l'espace de noms. Consultez les journaux d'erreur."
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "Impossible de créer l'espace de noms. Consultez les journaux d'erreur."
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+#, fuzzy
+msgid "connected"
+msgstr "<b>Déconnecté</b>"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+#, fuzzy
+msgid "Failed to setup phone (internal error)"
+msgstr "Impossible de décoder l'intervalle de temps fourni !"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, fuzzy, c-format
+msgid "Resolving `%s'."
+msgstr "Téléchargement de « %s »\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, fuzzy, c-format
+msgid "Calling `%s'."
+msgstr "Téléchargement de « %s »\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr ""
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -48,12 +200,12 @@ msgid ""
 "be a C string\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 #, fuzzy
 msgid "no description supplied"
 msgstr "Collection arrêtée.\n"
@@ -63,110 +215,110 @@ msgstr "Collection arrêtée.\n"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 #, fuzzy
 msgid "_Download"
 msgstr "Téléchar_ger"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 #, fuzzy
 msgid "Download _recursively"
 msgstr "récursiv_ement"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 #, fuzzy
 msgid "Download _as..."
 msgstr "Téléchar_ger"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 #, fuzzy
 msgid "_Abort download"
 msgstr "Téléchar_ger"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr "_Copier l'URI dans le presse-papiers"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Pub_lier"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr "Impossible de créer l'URI de l'espace de noms à partir de « %s ».\n"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "Impossible de créer l'espace de noms. Consultez les journaux d'erreur."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, fuzzy, c-format
 msgid "Processed file `%s'.\n"
 msgstr "Erreur d'accès au fichier « %s »."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 #, fuzzy
 msgid "Select a type"
 msgstr "Sélectionner tous les fichiers"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, fuzzy, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "Erreur lors de la copie en mémoire du fichier « %s »."
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr ""
 
@@ -175,24 +327,24 @@ msgstr ""
 msgid "Could not access indexed file `%s'\n"
 msgstr "Erreur d'accès au fichier « %s »."
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Artiste"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Artiste"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, fuzzy, c-format
 msgid "Failed to load animation from file `%s'\n"
@@ -200,97 +352,107 @@ msgstr ""
 "ATTENTION : Impossible d'obtenir de gnunetd les statistiques concernant la "
 "connexion.\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "URI invalide : « %s »"
 
-#: src/lib/glade.c:123
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
 
-#: src/main/gnunet-gtk.c:220
-#, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+#: src/lib/glade.c:133
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+msgid "<new zone>"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr "jamais"
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, fuzzy, c-format
 msgid "Operation failed: `%s'\n"
 msgstr "Erreur lors de la publication du fichier : %s"
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+msgid "Failed to communicate with database"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr ""
 "ATTENTION : Impossible d'obtenir de gnunetd les statistiques concernant la "
 "connexion.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr ""
 "ATTENTION : Impossible d'obtenir de gnunetd les statistiques concernant la "
 "connexion.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -298,51 +460,68 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2258
-#, c-format
-msgid "Got invalid record name `%s' from namestore\n"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Publications</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 #, fuzzy
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr ""
 "Impossible de publier du contenu dans l'espace de noms (consultez les "
 "journaux d'erreur).\n"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "Impossible de créer l'espace de noms. Consultez les journaux d'erreur."
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -358,16 +537,135 @@ msgstr ""
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "Impossible de créer l'espace de noms. Consultez les journaux d'erreur."
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+#, fuzzy
+msgid "Name resolution failed\n"
+msgstr "Erreur lors de la publication du fichier : %s"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, c-format
+msgid "Unsupported address family %d\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "Impossible de créer l'espace de noms. Consultez les journaux d'erreur."
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:209
+#, fuzzy, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr ""
+"ATTENTION : Impossible d'obtenir de gnunetd les statistiques concernant la "
+"connexion.\n"
+
+#: src/setup/gnunet-setup.c:271
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "À propos de gnunet-gtk"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -399,490 +697,406 @@ msgid ""
 "server!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1255
-msgid "How many bytes per second are we allowed to transmit?"
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1267
-msgid "How many bytes per second are we allowed to receive?"
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1281
-msgid "Enable communication via TCP"
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1293
-msgid "Enable communication via UDP"
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1305
-msgid "Enable communication via HTTP as a server"
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1317
-msgid "Enable communication via HTTP as a client"
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1329
-msgid "Enable communication via HTTPS as a server"
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1341
-msgid "Enable communication via HTTPS as a client"
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1353
-msgid "Enable communication via DV"
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1365
-msgid "Enable communication via WLAN"
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1377
-msgid "Port we bind to for TCP"
+#: src/setup/gnunet-setup-options.c:1483
+msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
-msgid "Port visible to other peers"
+#: src/setup/gnunet-setup-options.c:1495
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1509
+msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
+#: src/setup/gnunet-setup-options.c:1521
+msgid "Enable communication via UDP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1533
+msgid "Enable communication via HTTP as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
+#: src/setup/gnunet-setup-options.c:1545
+msgid "Enable communication via HTTP as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
+#: src/setup/gnunet-setup-options.c:1557
+msgid "Enable communication via HTTPS as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
+#: src/setup/gnunet-setup-options.c:1569
+msgid "Enable communication via HTTPS as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1581
+msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
+#: src/setup/gnunet-setup-options.c:1593
+msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1605
+msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
+msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr ""
 "Quelle est l'importance du fichier (utilisée pour classer les fichiers par "
 "ordre de priorité dans la base de données locale)."
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 #, fuzzy
 msgid "Configuration file for MySQL access"
 msgstr "Fichier de _configuration à utiliser pour gnunetd :"
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 #, fuzzy
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "Fichier de _configuration à utiliser pour gnunetd :"
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr ""
 "Quelle est l'importance du fichier (utilisée pour classer les fichiers par "
 "ordre de priorité dans la base de données locale)."
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2180
+msgid "Should the PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 #, fuzzy
 msgid "Specification of .gnunet hosted services"
 msgstr "Spécifiez ici l'emplacement de « gnunetd.conf »"
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:227
-#, fuzzy, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr ""
-"ATTENTION : Impossible d'obtenir de gnunetd les statistiques concernant la "
-"connexion.\n"
-
-#: src/setup/gnunet-setup.c:279
-#, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "À propos de gnunet-gtk"
-
-#: src/setup/gnunet-setup.c:631
-#, fuzzy
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr "_Lancer l'assistant de configuration"
-
-#: src/setup/gnunet-setup.c:652
-#, fuzzy
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr "_Lancer l'assistant de configuration"
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr "Connectivité"
+#: src/statistics/functions.c:519
+msgid "Connectivity"
+msgstr "Connectivité"
 
 #: src/statistics/functions.c:520
 msgid "# connected nodes (100% = connection table size)"
@@ -941,7 +1155,7 @@ msgstr "Efficacité du routage"
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr "Efficacité (rouge) courante (100% = parfaite)"
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 
@@ -950,6 +1164,19 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr "Connecté à %Lu pairs"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -959,6 +1186,7 @@ msgstr "Connecté à %Lu pairs"
 msgid "Developed by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -968,6 +1196,7 @@ msgstr ""
 msgid "Documented by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -977,6 +1206,7 @@ msgstr ""
 msgid "Translated by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -986,6 +1216,7 @@ msgstr ""
 msgid "Artwork by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -996,6 +1227,7 @@ msgstr ""
 msgid "Credits"
 msgstr "Afficher les crédits"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -1005,115 +1237,341 @@ msgstr "Afficher les crédits"
 msgid "License"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Nom du fichier"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+#, fuzzy
+msgid "_Caller Identity"
+msgstr "Identité"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr "_Journaux"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+#, fuzzy
+msgid "<b>Caller Identity</b>"
+msgstr "<b>Contenu disponible</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "État"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+#, fuzzy
+msgid "resume"
+msgstr "_Reprendre"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+#, fuzzy
+msgid "Terminate a conversation."
+msgstr "Configuration _avancée"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Type"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "Nom"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr "Valeur :"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+#, fuzzy
+msgid "Public?"
+msgstr "Pub_lier"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<b>Publications</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Applications lancées</b>"
+
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Anonymat :"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 #, fuzzy
 msgid "_recursive"
 msgstr "récursiv_ement"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "_Général"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "Espace de _noms"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 #, fuzzy
 msgid "_Publication type:"
 msgstr "_Publication"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 #, fuzzy
 msgid "Select file"
 msgstr "Sélectionner tous les fichiers"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 #, fuzzy
 msgid "Preview:"
 msgstr "A_perçu :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "_Mot-clé :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 #, fuzzy
 msgid "_Index file:"
 msgstr "_Identifiant :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 #, fuzzy
 msgid "_Root keyword:"
 msgstr "_Mot-clé :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 #, fuzzy
 msgid "A_nonymity:"
 msgstr "_Anonymat :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 #, fuzzy
 msgid "_Priority:"
 msgstr "_Priorité :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 #, fuzzy
 msgid "_Replication:"
 msgstr "Application"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 #, fuzzy
 msgid "Publication options:"
 msgstr "_Publication"
@@ -1123,130 +1581,274 @@ msgstr "_Publication"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Entrez des méta-données (descriptions) pour cet espace de noms"
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Nom"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
+#, fuzzy
+msgid "Normal"
+msgstr "Format"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+msgid "PDF documents"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:371
+#, fuzzy
+msgid "Copy selection"
+msgstr "_Collection"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 #, fuzzy
 msgid "gnunet-fs-gtk"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
+#: contrib/gnunet_fs_gtk_main_window.glade:438
 msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 #, fuzzy
 msgid "_File sharing"
 msgstr "Partage de fic_hiers"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
+#: contrib/gnunet_fs_gtk_main_window.glade:483
 #, fuzzy
 msgid "_Publish"
 msgstr "Pub_lier"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
+#: contrib/gnunet_fs_gtk_main_window.glade:486
 #, fuzzy
 msgid "Publish files or directories on GNUnet"
 msgstr "Publier un fichier sur GNUnet"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 #, fuzzy
 msgid "_List indexed files"
 msgstr "inde_xer"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
+#: contrib/gnunet_fs_gtk_main_window.glade:515
 msgid "Download a file or directory with a known URI."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
+#: contrib/gnunet_fs_gtk_main_window.glade:526
 #, fuzzy
 msgid "_Open GNUnet directory"
 msgstr "Ouvrir un répertoire GNUnet à partir d'un fichier"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_fs_gtk_main_window.glade:529
 msgid ""
 "Use this option to browse a GNUnet directory file that has been previously "
 "downloaded."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_fs_gtk_main_window.glade:549
 msgid ""
 "Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
+#: contrib/gnunet_fs_gtk_main_window.glade:564
 #, fuzzy
 msgid "_Edit"
 msgstr "_Quitter"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
+#: contrib/gnunet_fs_gtk_main_window.glade:575
 #, fuzzy
 msgid "Edit the system configuration."
 msgstr "_Lancer l'assistant de configuration"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:275
+#: contrib/gnunet_fs_gtk_main_window.glade:599
 msgid "Show meta data in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
+#: contrib/gnunet_fs_gtk_main_window.glade:600
 #, fuzzy
 msgid "Metadata"
 msgstr "Meta-données"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
+#: contrib/gnunet_fs_gtk_main_window.glade:610
 msgid "Show preview (when available)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
+#: contrib/gnunet_fs_gtk_main_window.glade:611
 msgid "Preview"
 msgstr "Aperçu"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
+#: contrib/gnunet_fs_gtk_main_window.glade:621
 msgid "Show search box in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
 #, fuzzy
 msgid "Search"
 msgstr "R_echercher"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:323
+#: contrib/gnunet_fs_gtk_main_window.glade:647
 msgid "Display information about this version of gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:354
+#: contrib/gnunet_fs_gtk_main_window.glade:679
 #, fuzzy
 msgid "Namespace:"
 msgstr "Espace de _noms"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:395
+#: contrib/gnunet_fs_gtk_main_window.glade:725
 msgid ""
 "Remember the specified namespace for later.\n"
 "This operation will be executed using the anonymity level specified on the "
 "right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:415
+#: contrib/gnunet_fs_gtk_main_window.glade:746
 #, fuzzy
 msgid "Keywords:"
 msgstr "Mots-clés"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:459
+#: contrib/gnunet_fs_gtk_main_window.glade:787
 msgid ""
 "Search using the given keywords.  The search may be narrowed by the given "
 "mime type and/or restricted to a namespace.\n"
@@ -1254,229 +1856,74 @@ msgid ""
 "right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
 #, fuzzy
 msgid "Anonymity:"
 msgstr "_Anonymat :"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:538
+#: contrib/gnunet_fs_gtk_main_window.glade:867
 #, fuzzy
 msgid "Mime-type:"
 msgstr "Type Mime"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
 #: contrib/gnunet_fs_gtk_search_tab.glade:104
 msgid "Status"
 msgstr "État"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:848
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
 #, fuzzy
 msgid "Download into:"
 msgstr "Téléchar_ger"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:862
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
 msgid "Select a directory to download into"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:888
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
 #, fuzzy
 msgid "Download as:"
 msgstr "Téléchar_ger"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:991
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
 #, fuzzy
 msgid "Recursive"
 msgstr "récursiv_ement"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
 #, fuzzy
 msgid "Download!"
 msgstr "Téléchar_ger"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
 msgid "Thumbnail associated with the currently selected content"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
 #, fuzzy
 msgid "File meta data"
 msgstr "Afficher les métadonnées"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
-#, fuzzy
-msgid "Normal"
-msgstr "Format"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-msgid "PDF documents"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
-#, fuzzy
-msgid "Copy selection"
-msgstr "_Collection"
-
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 msgid "Enter the URI to be downloaded"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 #, fuzzy
 msgid "_URI:"
 msgstr "URI"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 #, fuzzy
 msgid "<b>Messages</b>"
 msgstr "Messages"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr ""
 
@@ -1484,46 +1931,46 @@ msgstr ""
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 #, fuzzy
 msgid "Publish content on GNUnet"
 msgstr "Publier un fichier sur GNUnet"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 #, fuzzy
 msgid "_Create empty directory"
 msgstr "Ouvrir un répertoire GNUnet à partir d'un fichier"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 #, fuzzy
 msgid "Add _Directory"
 msgstr "Répertoire"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1531,11 +1978,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1554,18 +2001,18 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 msgid "Identifier:"
 msgstr "Identifiant :"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1574,36 +2021,36 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "Identifiant suivant"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 msgid "Identifier"
 msgstr "Identifiant"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "Identifiant suivant"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr "Description"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 #, fuzzy
 msgid "Make publication updateable"
 msgstr "Prochaine date de publication"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1611,18 +2058,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "Identifiant suivant"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1630,15 +2077,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 msgid ""
 "This button removes all keywords from all files and directories in this "
 "dialog.\n"
@@ -1649,51 +2096,78 @@ msgid ""
 "Note that meta data is unaffected when using this function."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 #, fuzzy
 msgid "_Cancel"
 msgstr "A_vancé"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
 #, fuzzy
-msgid "Priority:"
-msgstr "_Priorité :"
+msgid "Select directory to publish"
+msgstr "Choisissez le dossier que vous voulez publier."
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+#, fuzzy
+msgid "Priority:"
+msgstr "_Priorité :"
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 #, fuzzy
 msgid "Index files"
 msgstr "inde_xer"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Publish file..."
 msgstr "Nom de publication du fichier"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 #, fuzzy
 msgid "Index file"
 msgstr "inde_xer"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 #, fuzzy
 msgid "Progress"
 msgstr "Avancement"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 #, fuzzy
 msgid "Publishing"
 msgstr "Pub_lier"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1702,49 +2176,54 @@ msgstr ""
 msgid "Indexed files"
 msgstr "inde_xer"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "inde_xer"
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 #, fuzzy
 msgid "gnunet-gtk"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "_Statistiques"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "Partage de fic_hiers"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+#, fuzzy
+msgid "Voice conversation"
+msgstr "Configuration _avancée"
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuration _avancée"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 #, fuzzy
 msgid "Quit"
 msgstr "_Quitter"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1752,231 +2231,236 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "Messages"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 #, fuzzy
 msgid "Type:"
 msgstr "_Type :"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "_Valeur :"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Type"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
-msgstr "Valeur :"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 #, fuzzy
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr "Métadonnées décrivant l'espace de noms (utilisées dans les annonces)"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "Nom"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Applications lancées</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 msgid "Execute advertisement."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Nom du fichier"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "Identifiant suivant"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
 "change it later (based on the selected expiration values)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 #, fuzzy
 msgid "<b>Name</b>"
 msgstr "Messages"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
 msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
 msgid "Record is public (visible to other users)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:285
 #: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
 msgid "Record is a shadow record (valid after other records expire)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
 msgid ""
 "A shadow record is a record which becomes valid in the future.  They are not "
 "used as long as a second non-expired record with the same name and type "
@@ -1987,52 +2471,61 @@ msgid ""
 "becomes valid at midnight."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "<b>Applications lancées</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
 msgid "Relative"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
 msgid ""
 "Records with a relative expiration time (such as 1 week) are always valid "
 "for at least that time period into the future. In other words, the auto-"
@@ -2043,266 +2536,506 @@ msgid ""
 "entries for which you do not know a specific date when they will expire."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
-msgid "Absolute"
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
+msgid ""
+"Records with an absolute expiration time are valid until the specified date. "
+"You can change that date to an even later date, but you cannot set it to an "
+"earlier time (as other users may have cached the longer expiration time). "
+"Use absolute expiration times if you know that a particular record will only "
+"be valid until a particular day."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
+#, fuzzy
+msgid "Never"
+msgstr "jamais"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
+msgid ""
+"Records can be set to be valid forever. This is great if you are worried "
+"about censorship or certain that the mapping will never change.  Note that "
+"if you set a public record to never expire, you cannot later change it (as "
+"other users are free to cache the old value forever)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
+msgid ""
+"Select the date on which you want this record to expire. At that date, you "
+"can then create a new mapping or have a shadow record go automatically into "
+"effect.  Note that for public records you cannot change the expiration time "
+"to an earlier date after the fact."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
+#, fuzzy
+msgid "Minutes:"
+msgstr "minutes"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
+#, fuzzy
+msgid "Seconds:"
+msgstr "secondes"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
+msgid ""
+"Relative expiration time of the record.  The syntax is a number followed by "
+"a space and a time unit, possibly followed by additional numbers and time "
+"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
+"drop-down menu to select from a set of common defaults. (Editing is not "
+"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Publications</b>"
+
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
+msgid ""
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+msgid "_Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+#, fuzzy
+msgid "<b>Service record (SRV)</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
-msgid ""
-"Records with an absolute expiration time are valid until the specified date. "
-"You can change that date to an even later date, but you cannot set it to an "
-"earlier time (as other users may have cached the longer expiration time). "
-"Use absolute expiration times if you know that a particular record will only "
-"be valid until a particular day."
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
 #, fuzzy
-msgid "Never"
-msgstr "jamais"
+msgid "Selector:"
+msgstr "Choisir un aperçu"
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
-msgid ""
-"Records can be set to be valid forever. This is great if you are worried "
-"about censorship or certain that the mapping will never change.  Note that "
-"if you set a public record to never expire, you cannot later change it (as "
-"other users are free to cache the old value forever)."
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
-msgid ""
-"Select the date on which you want this record to expire. At that date, you "
-"can then create a new mapping or have a shadow record go automatically into "
-"effect.  Note that for public records you cannot change the expiration time "
-"to an earlier date after the fact."
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
-msgid "Hours:"
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
-msgid "Which hour of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
-#, fuzzy
-msgid "Minutes:"
-msgstr "minutes"
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
-msgid "Which minute of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
 #, fuzzy
-msgid "Seconds:"
-msgstr "secondes"
+msgid "Certificate:"
+msgstr "Identifiant :"
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
-msgid "Which second of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_box.glade:821
 msgid ""
-"Relative expiration time of the record.  The syntax is a number followed by "
-"a space and a time unit, possibly followed by additional numbers and time "
-"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
-"drop-down menu to select from a set of common defaults. (Editing is not "
-"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
 #, fuzzy
-msgid "<b>Expiration Time</b>"
-msgstr "<b>Publications</b>"
+msgid "<b>TLSA Record Information</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:329
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "Messages"
+
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2312,35 +3045,35 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr ""
 
@@ -2348,204 +3081,231 @@ msgstr ""
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "_Pairs"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 msgid "Enter the phone line used for the user at the peer here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Mots-clés</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 msgid "Enter the public key of the authority here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-#, fuzzy
-msgid "<b>Service record (SRV)</b>"
-msgstr "<b>Configuration du démon GNUnet</b>"
-
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 #, fuzzy
 msgid "Peer:"
 msgstr "_Pairs"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+#, fuzzy
+msgid "Edit"
+msgstr "_Quitter"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
-msgid "Preferred zone name (NICK):"
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
+#, fuzzy
+msgid " _Select Zone"
+msgstr "Sélectionner tous les fichiers"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 #, fuzzy
 msgid "QR code for the selected zone"
 msgstr "Fermer la recherche sélectionnée"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+msgid "  _Edit Zone "
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-#, fuzzy
-msgid "Edit"
-msgstr "_Quitter"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 #, fuzzy
@@ -3172,112 +3932,116 @@ msgstr ""
 "Phan Vinh Thinh <address@hidden>\n"
 "Daniel Nylander <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 #, fuzzy
 msgid "Address valid?"
 msgstr "Adresse"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-peerinfo-gtk"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 #, fuzzy
 msgid "Friend"
 msgstr "inde_xer"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "État"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-setup"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
 "use."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Partage de fic_hiers"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+msgid "VPN"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:495
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3288,445 +4052,468 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
 "\".gnunet\" TLD."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 #, fuzzy
 msgid "F_2F only"
 msgstr "un _seul fichier"
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "_Général"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "_Général"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:733
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
 #, fuzzy
-msgid "<b>Bandwidth Configuration</b>"
-msgstr "<b>Configuration du démon GNUnet</b>"
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr ""
+msgid "_Proxy type:"
+msgstr "_Publication"
 
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:783
-#, fuzzy
-msgid "Attempt automatic configuration"
-msgstr "_Lancer l'assistant de configuration"
-
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "Nom du _fichier :"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+msgid "Proxy password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1248
+msgid "_Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1294
+msgid "Max. upload bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1018
+#: contrib/gnunet_setup_main_window.glade:1343
 #, fuzzy
-msgid "<b>NAT Traversal Configuration</b>"
+msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 #, fuzzy
 msgid "Test configuration"
 msgstr "Configuration _avancée"
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
 "can only work if you are not running your peer at the time you run the test."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+msgid "HTTP-Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2424
+msgid "HTTP-Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2625
+msgid "HTTPS-Server"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2891
+msgid "HTTPS-Client"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Applications lancées</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 #, fuzzy
 msgid "Postgres"
 msgstr "Avancement"
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 #, fuzzy
 msgid "gnunet"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Fichier de _configuration à utiliser pour gnunetd :"
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 #, fuzzy
 msgid "Username:"
 msgstr "Nom du _fichier :"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 #, fuzzy
 msgid "Configuration:"
 msgstr "Configuration _avancée"
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Partage de fic_hiers"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4184
+#, fuzzy
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3734,11 +4521,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3746,12 +4533,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Traffic entrant"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3762,173 +4549,138 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3486
-#, fuzzy
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<b>Configuration du démon GNUnet</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+msgid "_VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
 "support before enabling this option."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
 "192.168.0.1/255.255.0.0).  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<b>Publications</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "Identifiant"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 msgid "_Port"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "Description"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 #, fuzzy
 msgid "GNS & N_amestore"
 msgstr "Espace de _noms"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
@@ -3937,12 +4689,12 @@ msgstr ""
 msgid "About gnunet-statistics-gtk"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 #, fuzzy
 msgid "gnunet-statistics-gtk"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr ""
 
@@ -3951,15 +4703,35 @@ msgstr ""
 msgid "_Connections"
 msgstr "Connectivité"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 #, fuzzy
 msgid "_Traffic"
 msgstr "Traffic entrant"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr ""
 
+#, fuzzy
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<b>Publications</b>"
+
+#, fuzzy
+#~ msgid "Attempting fully-automatic, non-interactive network configuration\n"
+#~ msgstr "_Lancer l'assistant de configuration"
+
+#, fuzzy
+#~ msgid "attempt automatic configuration of the network and instantly exit"
+#~ msgstr "_Lancer l'assistant de configuration"
+
+#, fuzzy
+#~ msgid "Attempt automatic configuration"
+#~ msgstr "_Lancer l'assistant de configuration"
+
+#, fuzzy
+#~ msgid "<b>NAT Traversal Configuration</b>"
+#~ msgstr "<b>Configuration du démon GNUnet</b>"
+
 #~ msgid "Internal error"
 #~ msgstr "Erreur interne"
 
@@ -4014,10 +4786,6 @@ msgstr ""
 #~ msgid "_Options"
 #~ msgstr "Opé_rations"
 
-#, fuzzy
-#~ msgid "<b>Domain Owner Information</b>"
-#~ msgstr "<b>Configuration du démon GNUnet</b>"
-
 #~ msgid "Country"
 #~ msgstr "Pays"
 
@@ -4119,9 +4887,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "Le réseau pair-à-pair GNU"
 
-#~ msgid "Identity"
-#~ msgstr "Identité"
-
 #~ msgid "anonymous"
 #~ msgstr "anonyme"
 
@@ -4137,9 +4902,6 @@ msgstr ""
 #~ msgid "Choose the file you want to publish."
 #~ msgstr "Choisissez le fichier que vous voulez publier."
 
-#~ msgid "Choose the directory you want to publish."
-#~ msgstr "Choisissez le dossier que vous voulez publier."
-
 #~ msgid "Title"
 #~ msgstr "Titre"
 
@@ -4250,9 +5012,6 @@ msgstr ""
 #~ msgid "Should the namespace `%s' really be deleted?"
 #~ msgstr "Voulez-vous réellement supprimer l'espace de noms « %s » ?"
 
-#~ msgid "Downloading `%s'\n"
-#~ msgstr "Téléchargement de « %s »\n"
-
 #~ msgid "ERROR: already downloading `%s'"
 #~ msgstr "ERREUR : téléchargement de « %s » déjà en cours"
 
@@ -4298,9 +5057,6 @@ msgstr ""
 #~ msgid "GNUnet - Connected to %Lu peers"
 #~ msgstr "GNUnet - Connecté à %Lu pairs"
 
-#~ msgid "<b>Disconnected</b>"
-#~ msgstr "<b>Déconnecté</b>"
-
 #~ msgid "GNUnet - Disconnected"
 #~ msgstr "GNUnet - Déconnecté"
 
@@ -4690,9 +5446,6 @@ msgstr ""
 #~ msgid "end collection (will not delete content already in the collection)"
 #~ msgstr "Arrêter une collection (ne supprimera pas son contenu déjà publié)"
 
-#~ msgid "<b>Available content</b>"
-#~ msgstr "<b>Contenu disponible</b>"
-
 #~ msgid ""
 #~ "Should GNUnet track available content (for publishing in namespaces)?"
 #~ msgstr ""
@@ -4717,9 +5470,6 @@ msgstr ""
 #~ msgid "Cha_t"
 #~ msgstr "_Clavardage"
 
-#~ msgid "_Logs"
-#~ msgstr "_Journaux"
-
 #~ msgid "Edit File Information"
 #~ msgstr "Editer les informations sur le fichier"
 
@@ -4790,9 +5540,6 @@ msgstr ""
 #~ msgid "Lists all of the keywords that will be used."
 #~ msgstr "Liste de tous les mots-clés qui seront utilisés."
 
-#~ msgid "Select Preview"
-#~ msgstr "Choisir un aperçu"
-
 #~ msgid "Cancel the publication."
 #~ msgstr "Annuler la publication."
 
@@ -4863,9 +5610,6 @@ msgstr ""
 #~ msgid "Resume the search"
 #~ msgstr "Relancer cette recherche"
 
-#~ msgid "_Resume"
-#~ msgstr "_Reprendre"
-
 #~ msgid "Close search tab (also aborts search)"
 #~ msgstr "Fermer l'onglet de recherche (annule aussi la recherche)"
 
@@ -5104,9 +5848,6 @@ msgstr ""
 #~ msgid "--no update--"
 #~ msgstr "--pas de mise à jour--"
 
-#~ msgid "Failed to parse given time interval!"
-#~ msgstr "Impossible de décoder l'intervalle de temps fourni !"
-
 #~ msgid ""
 #~ "Failed to create namespace `%s'.Consult logs, most likely error is that a "
 #~ "namespace with that name already exists."
diff --git a/po/gnunet-gtk.pot b/po/gnunet-gtk.pot
index a8d6242c..9baed572 100644
--- a/po/gnunet-gtk.pot
+++ b/po/gnunet-gtk.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the gnunet-gtk package.
 # FIRST AUTHOR <address@hidden>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gnunet-gtk 0.10.1\n"
+"Project-Id-Version: gnunet-gtk 0.11.0pre66\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -17,30 +17,179 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+msgid "select ego to use"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, c-format
+msgid "Invalid URI `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, c-format
+msgid "Invalid label `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, c-format
+msgid "Adding contact failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+msgid "connected"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+msgid "Failed to setup phone (internal error)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, c-format
+msgid "Resolving `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, c-format
+msgid "Calling `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr ""
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -48,12 +197,12 @@ msgid ""
 "be a C string\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 msgid "no description supplied"
 msgstr ""
 
@@ -62,102 +211,102 @@ msgstr ""
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 msgid "_Download"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 msgid "Download _recursively"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 msgid "Download _as..."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 msgid "_Abort download"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 msgid "no URI"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 msgid "_Abort publishing"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 msgid "Failed to resolve namespace in time\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, c-format
 msgid "Failed to save record: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, c-format
 msgid "Processed file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 msgid "Select a type"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr ""
 
@@ -166,21 +315,21 @@ msgstr ""
 msgid "Could not access indexed file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk.c:251
-msgid "_Advertise"
+#: src/identity/gnunet-identity-gtk_advertise.c:207
+msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
+#: src/identity/gnunet-identity-gtk_advertise.c:236
+#, c-format
+msgid "Failed to advertise ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:203
-msgid "Aborting advertising operation due to shutdown.\n"
+#: src/identity/gnunet-identity-gtk.c:246
+msgid "_Advertise"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
-#, c-format
-msgid "Failed to advertise ego: %s\n"
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
 msgstr ""
 
 #: src/lib/animations.c:146
@@ -188,91 +337,100 @@ msgstr ""
 msgid "Failed to load animation from file `%s'\n"
 msgstr ""
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr ""
 
-#: src/lib/glade.c:123
-#, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/lib/eventloop.c:542
+msgid "Failed to initialize GNUnet-GTK select\n"
 msgstr ""
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
 
-#: src/main/gnunet-gtk.c:220
+#: src/lib/glade.c:133
 #, c-format
-msgid "Restarting crashed plugin `%s'\n"
+msgid "Failed to load `%s': %s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+msgid "<new zone>"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 msgid "Failed to initialize QR-code pixbuf"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, c-format
 msgid "Operation failed: `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+msgid "Failed to communicate with database"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -280,48 +438,65 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2258
-#, c-format
-msgid "Got invalid record name `%s' from namestore\n"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, c-format
-msgid "<b>Editing zone %s</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -337,15 +512,130 @@ msgstr ""
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+msgid "Name resolution failed\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, c-format
+msgid "Unsupported address family %d\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 msgid "Failed to parse list of friends\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:209
+#, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:271
+#, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:422
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -377,501 +667,422 @@ msgid ""
 "server!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1255
-msgid "How many bytes per second are we allowed to transmit?"
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1267
-msgid "How many bytes per second are we allowed to receive?"
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1281
-msgid "Enable communication via TCP"
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1293
-msgid "Enable communication via UDP"
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1305
-msgid "Enable communication via HTTP as a server"
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1317
-msgid "Enable communication via HTTP as a client"
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1329
-msgid "Enable communication via HTTPS as a server"
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1341
-msgid "Enable communication via HTTPS as a client"
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1353
-msgid "Enable communication via DV"
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1365
-msgid "Enable communication via WLAN"
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1377
-msgid "Port we bind to for TCP"
+#: src/setup/gnunet-setup-options.c:1483
+msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
-msgid "Port visible to other peers"
+#: src/setup/gnunet-setup-options.c:1495
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1509
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1521
+msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
+#: src/setup/gnunet-setup-options.c:1533
+msgid "Enable communication via HTTP as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
+#: src/setup/gnunet-setup-options.c:1545
+msgid "Enable communication via HTTP as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
+#: src/setup/gnunet-setup-options.c:1557
+msgid "Enable communication via HTTPS as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
+#: src/setup/gnunet-setup-options.c:1569
+msgid "Enable communication via HTTPS as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1581
+msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
+#: src/setup/gnunet-setup-options.c:1593
+msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1605
+msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
+msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2180
+msgid "Should the PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 msgid "Specification of .gnunet hosted services"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
+#: src/statistics/functions.c:519
+msgid "Connectivity"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
+#: src/statistics/functions.c:520
+msgid "# connected nodes (100% = connection table size)"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
+#: src/statistics/functions.c:528
+msgid "System load"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
+#: src/statistics/functions.c:530
+msgid ""
+"CPU load (red), IO load (green), Network upload (yellow), Network download "
+"(blue)"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/statistics/functions.c:538
+msgid "Datastore capacity"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/statistics/functions.c:539
+msgid "Persistent file-sharing data (red) and DHT cache (green)"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:227
-#, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:279
-#, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:550
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:631
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:652
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr ""
-
-#: src/statistics/functions.c:520
-msgid "# connected nodes (100% = connection table size)"
-msgstr ""
-
-#: src/statistics/functions.c:528
-msgid "System load"
-msgstr ""
-
-#: src/statistics/functions.c:530
-msgid ""
-"CPU load (red), IO load (green), Network upload (yellow), Network download "
-"(blue)"
-msgstr ""
-
-#: src/statistics/functions.c:538
-msgid "Datastore capacity"
-msgstr ""
-
-#: src/statistics/functions.c:539
-msgid "Persistent file-sharing data (red) and DHT cache (green)"
-msgstr ""
-
-#: src/statistics/functions.c:547
-msgid "Inbound Traffic"
+#: src/statistics/functions.c:547
+msgid "Inbound Traffic"
 msgstr ""
 
 #: src/statistics/functions.c:549 src/statistics/functions.c:559
@@ -900,7 +1111,7 @@ msgstr ""
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr ""
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 
@@ -909,6 +1120,19 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -918,6 +1142,7 @@ msgstr ""
 msgid "Developed by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -927,6 +1152,7 @@ msgstr ""
 msgid "Documented by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -936,6 +1162,7 @@ msgstr ""
 msgid "Translated by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -945,6 +1172,7 @@ msgstr ""
 msgid "Artwork by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -954,6 +1182,7 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -963,485 +1192,689 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
-msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
-msgid "Save file as..."
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
-msgid "_Anonymity:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+msgid "_File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
-msgid "_recursive"
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
-msgid "Generic"
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
-msgid "Text"
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+msgid "_Caller Identity"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
-msgid "Music"
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
-msgid "Video"
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
-msgid "Image"
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
-msgid "Software"
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
-msgid "Namespace"
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
+msgid ""
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
-msgid "_Publication type:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
-msgid "Select file"
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
-msgid "Preview:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
-msgid "_Keyword:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
-msgid "_Index file:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+msgid "<b>Caller Identity</b>"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
-msgid "_Root keyword:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+msgid "State"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
-msgid "A_nonymity:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
-msgid "_Priority:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
-msgid "_Expriation year:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
-msgid "_Replication:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
-msgid "Publication options:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:7
-msgid "Enter the desired nickname for the namespace"
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
-msgid "_Nickname:"
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
-msgid "gnunet-fs-gtk"
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
-msgid "Your peer is currently not connected."
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+msgid "resume"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
-msgid "_File sharing"
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
-msgid "_Publish"
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+msgid "<b>Active conversations</b>"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
-msgid "Publish files or directories on GNUnet"
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
-msgid "_List indexed files"
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
-msgid "Download a file or directory with a known URI."
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
-msgid "_Open GNUnet directory"
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+msgid "Terminate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+msgid "<b>Initiate conversation</b>"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
 msgid ""
-"Use this option to browse a GNUnet directory file that has been previously "
-"downloaded."
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+msgid "Public?"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
 msgid ""
-"Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
-msgid "_Edit"
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
-msgid "Edit the system configuration."
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:275
-msgid "Show meta data in main window"
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+msgid "<b>History</b>"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
-msgid "Metadata"
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+msgid "<b>Logs</b>"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
-msgid "Show preview (when available)"
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
+msgid "Save file as..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
-msgid "Preview"
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
+msgid "_Anonymity:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
-msgid "Show search box in main window"
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
+msgid "_recursive"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
-msgid "Search"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
+msgid "Generic"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
+msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:323
-msgid "Display information about this version of gnunet-fs-gtk"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
+msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:354
-msgid "Namespace:"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
+msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:395
-msgid ""
-"Remember the specified namespace for later.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right."
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
+msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:415
-msgid "Keywords:"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
+msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:459
-msgid ""
-"Search using the given keywords.  The search may be narrowed by the given "
-"mime type and/or restricted to a namespace.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right.\n"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
+msgid "Namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
-msgid "Anonymity:"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
+msgid "_Publication type:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:538
-msgid "Mime-type:"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
+msgid "Select file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
-#: contrib/gnunet_fs_gtk_search_tab.glade:104
-msgid "Status"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
+msgid "Preview:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:848
-msgid "Download into:"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
+msgid "_Keyword:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:862
-msgid "Select a directory to download into"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+msgid "_Index file:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:888
-msgid "Download as:"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
+msgid "_Root keyword:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:991
-msgid "Recursive"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
+msgid "A_nonymity:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
-msgid "Download!"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
+msgid "_Priority:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
-msgid "Thumbnail associated with the currently selected content"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
+msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
-msgid "File meta data"
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
+msgid "_Replication:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
+msgid "Publication options:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:7
+msgid "Enter the desired nickname for the namespace"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
+msgid "_Nickname:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
 msgid "None"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
 msgid "#AAAA00000000"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
 msgid "Normal"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
 msgid "#000000000000"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
 msgid "Paranoid"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
 msgid "#0000AAAA0000"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
+#: contrib/gnunet_fs_gtk_main_window.glade:226
 msgid "Any"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
 msgid " "
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
 msgid "N/A"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
+#: contrib/gnunet_fs_gtk_main_window.glade:247
 msgid "PDF documents"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
 msgid "lossless"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
 msgid "non-free"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
+#: contrib/gnunet_fs_gtk_main_window.glade:254
 msgid "JPEG image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
 msgid "lossy"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
 msgid "free"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
+#: contrib/gnunet_fs_gtk_main_window.glade:261
 msgid "PNG image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
+#: contrib/gnunet_fs_gtk_main_window.glade:268
 msgid "Audio"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
+#: contrib/gnunet_fs_gtk_main_window.glade:275
 msgid "OGG Vorbis audio"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
+#: contrib/gnunet_fs_gtk_main_window.glade:282
 msgid "MPEG audio"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
+#: contrib/gnunet_fs_gtk_main_window.glade:289
 msgid "Vorbis"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
+#: contrib/gnunet_fs_gtk_main_window.glade:296
 msgid "OGG Vorbis video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
+#: contrib/gnunet_fs_gtk_main_window.glade:303
 msgid "MPEG video (v2)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
+#: contrib/gnunet_fs_gtk_main_window.glade:310
 msgid "MPEG video (v4)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
+#: contrib/gnunet_fs_gtk_main_window.glade:317
 msgid "AVI video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
+#: contrib/gnunet_fs_gtk_main_window.glade:324
 msgid "ASF video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
+#: contrib/gnunet_fs_gtk_main_window.glade:331
 msgid "Flash video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
+#: contrib/gnunet_fs_gtk_main_window.glade:338
 msgid "Tar archive"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
+#: contrib/gnunet_fs_gtk_main_window.glade:345
 msgid "Zip archive"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
+#: contrib/gnunet_fs_gtk_main_window.glade:371
 msgid "Copy selection"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
-msgid "Enter the URI to be downloaded"
+#: contrib/gnunet_fs_gtk_main_window.glade:417
+msgid "gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
-msgid "_URI:"
+#: contrib/gnunet_fs_gtk_main_window.glade:438
+msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
-msgid "<b>Messages</b>"
+#: contrib/gnunet_fs_gtk_main_window.glade:476
+msgid "_File sharing"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
-msgid "Preprocessing..."
+#: contrib/gnunet_fs_gtk_main_window.glade:483
+msgid "_Publish"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:14
-msgid "Preparing to save namespace in GNS zone"
+#: contrib/gnunet_fs_gtk_main_window.glade:486
+msgid "Publish files or directories on GNUnet"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_main_window.glade:499
+msgid "_List indexed files"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:515
+msgid "Download a file or directory with a known URI."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:526
+msgid "_Open GNUnet directory"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:529
+msgid ""
+"Use this option to browse a GNUnet directory file that has been previously "
+"downloaded."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:549
+msgid ""
+"Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:564
+msgid "_Edit"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:575
+msgid "Edit the system configuration."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:599
+msgid "Show meta data in main window"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:600
+msgid "Metadata"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:610
+msgid "Show preview (when available)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:611
+msgid "Preview"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:621
+msgid "Show search box in main window"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
+msgid "Search"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:647
+msgid "Display information about this version of gnunet-fs-gtk"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:679
+msgid "Namespace:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:725
+msgid ""
+"Remember the specified namespace for later.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:746
+msgid "Keywords:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:787
+msgid ""
+"Search using the given keywords.  The search may be narrowed by the given "
+"mime type and/or restricted to a namespace.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right.\n"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
+msgid "Anonymity:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:867
+msgid "Mime-type:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
+#: contrib/gnunet_fs_gtk_search_tab.glade:104
+msgid "Status"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
+msgid "Download into:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
+msgid "Select a directory to download into"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
+msgid "Download as:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
+msgid "Recursive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
+msgid "Download!"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
+msgid "Thumbnail associated with the currently selected content"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
+msgid "File meta data"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
+msgid "Enter the URI to be downloaded"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
+msgid "_URI:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
+msgid "<b>Messages</b>"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
+msgid "Preprocessing..."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:14
+msgid "Preparing to save namespace in GNS zone"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 msgid "Publish content on GNUnet"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 msgid "_Create empty directory"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 msgid "Add _Directory"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1449,11 +1882,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1472,18 +1905,18 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 msgid "Identifier:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1492,33 +1925,33 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 msgid "Previous identifiers"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 msgid "Identifier"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 msgid "Update identifier"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 msgid "Make publication updateable"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1526,17 +1959,17 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 msgid "Update identifier:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1544,15 +1977,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 msgid ""
 "This button removes all keywords from all files and directories in this "
 "dialog.\n"
@@ -1563,44 +1996,70 @@ msgid ""
 "Note that meta data is unaffected when using this function."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 msgid "_Cancel"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
-msgid "Priority:"
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
+msgid "Select directory to publish"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+msgid "Priority:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 msgid "Index files"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 msgid "Publish file..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 msgid "Index file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 msgid "Publishing"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1608,43 +2067,47 @@ msgstr ""
 msgid "Indexed files"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 msgid "Unindex the selected indexed file."
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 msgid "gnunet-gtk"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 msgid "Statistics"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 msgid "File-Sharing"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+msgid "Voice conversation"
+msgstr ""
+
+#: contrib/gnunet_gtk.glade:203
 msgid "Configuration"
 msgstr ""
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 msgid "Quit"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1652,544 +2115,794 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 msgid "<b>Namespace root</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 msgid "Type:"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
-msgid "Value:"
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
+msgid "Value:"
+msgstr ""
+
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
+msgid "<b>Namespace description to use in advertisement:</b>"
+msgstr ""
+
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
+msgid "<b>Keywords to advertise namespace under:</b>"
+msgstr ""
+
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
+msgid "<b>Publishing options</b>"
+msgstr ""
+
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
+msgid "Execute advertisement."
+msgstr ""
+
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
+msgid "Closes the dialog without advertising the namespace."
+msgstr ""
+
+#: contrib/gnunet_identity_gtk_main_window.glade:128
+msgid "Unique identifier"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
+msgid ""
+"Store the updated record in the database. If the record is public, GNUnet "
+"will begin to publish the record to the world, limiting your ability to "
+"change it later (based on the selected expiration values)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
+msgid "<b>Name</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
+msgid ""
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:267
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
+msgid ""
+"A shadow record is a record which becomes valid in the future.  They are not "
+"used as long as a second non-expired record with the same name and type "
+"exists. This is useful if a mapping is to be changed as soon as an existing "
+"record expires. For example, if a users are supposed to switch at midnight "
+"from one IP address to another, two records would be placed into the system: "
+"one that is valid until midnight, and a second \"shadow\" record that "
+"becomes valid at midnight."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
+msgid "<b>Options</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
+msgid ""
+"Records with a relative expiration time (such as 1 week) are always valid "
+"for at least that time period into the future. In other words, the auto-"
+"renew their own expiration to the given time period into the future. When "
+"you convert a public record with a relative expiration time to one with an "
+"absolute expiration time, the earliest possible expiration will be the "
+"respective relative time in the future. Use relative expiration times for "
+"entries for which you do not know a specific date when they will expire."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
+msgid ""
+"Records with an absolute expiration time are valid until the specified date. "
+"You can change that date to an even later date, but you cannot set it to an "
+"earlier time (as other users may have cached the longer expiration time). "
+"Use absolute expiration times if you know that a particular record will only "
+"be valid until a particular day."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
+msgid ""
+"Records can be set to be valid forever. This is great if you are worried "
+"about censorship or certain that the mapping will never change.  Note that "
+"if you set a public record to never expire, you cannot later change it (as "
+"other users are free to cache the old value forever)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
+msgid ""
+"Select the date on which you want this record to expire. At that date, you "
+"can then create a new mapping or have a shadow record go automatically into "
+"effect.  Note that for public records you cannot change the expiration time "
+"to an earlier date after the fact."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
+msgid "Minutes:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
+msgid "Seconds:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
+msgid ""
+"Relative expiration time of the record.  The syntax is a number followed by "
+"a space and a time unit, possibly followed by additional numbers and time "
+"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
+"drop-down menu to select from a set of common defaults. (Editing is not "
+"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
+msgid "<b>Expiration Time</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
+msgid ""
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
-msgid "<b>Namespace description to use in advertisement:</b>"
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
-msgid "<b>Keywords to advertise namespace under:</b>"
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+msgid "_Port:"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
-msgid "<b>Publishing options</b>"
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
-msgid "Execute advertisement."
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
-msgid "Closes the dialog without advertising the namespace."
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-msgid "_File"
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:128
-msgid "Unique identifier"
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
-msgid ""
-"Store the updated record in the database. If the record is public, GNUnet "
-"will begin to publish the record to the world, limiting your ability to "
-"change it later (based on the selected expiration values)."
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
-msgid "Name of the record in the zone."
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
-msgid "in"
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
-msgid ""
-"Select the desired zone for the record.  Changing this value here will move "
-"the record to the selected zone."
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+msgid "<b>Service record (SRV)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
-msgid "<b>Name</b>"
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
-msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
-msgid "Record is public (visible to other users)"
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:285
-#: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
-msgid "Record is a shadow record (valid after other records expire)"
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
-msgid ""
-"A shadow record is a record which becomes valid in the future.  They are not "
-"used as long as a second non-expired record with the same name and type "
-"exists. This is useful if a mapping is to be changed as soon as an existing "
-"record expires. For example, if a users are supposed to switch at midnight "
-"from one IP address to another, two records would be placed into the system: "
-"one that is valid until midnight, and a second \"shadow\" record that "
-"becomes valid at midnight."
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
+msgid "Selector:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
-msgid "<b>Options</b>"
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
-msgid "Relative"
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
-msgid ""
-"Records with a relative expiration time (such as 1 week) are always valid "
-"for at least that time period into the future. In other words, the auto-"
-"renew their own expiration to the given time period into the future. When "
-"you convert a public record with a relative expiration time to one with an "
-"absolute expiration time, the earliest possible expiration will be the "
-"respective relative time in the future. Use relative expiration times for "
-"entries for which you do not know a specific date when they will expire."
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
-msgid "Absolute"
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
-msgid ""
-"Records with an absolute expiration time are valid until the specified date. "
-"You can change that date to an even later date, but you cannot set it to an "
-"earlier time (as other users may have cached the longer expiration time). "
-"Use absolute expiration times if you know that a particular record will only "
-"be valid until a particular day."
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
-msgid "Never"
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
-msgid ""
-"Records can be set to be valid forever. This is great if you are worried "
-"about censorship or certain that the mapping will never change.  Note that "
-"if you set a public record to never expire, you cannot later change it (as "
-"other users are free to cache the old value forever)."
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
+msgid "Certificate:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
-msgid ""
-"Select the date on which you want this record to expire. At that date, you "
-"can then create a new mapping or have a shadow record go automatically into "
-"effect.  Note that for public records you cannot change the expiration time "
-"to an earlier date after the fact."
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
-msgid "Hours:"
+#: contrib/gnunet_namestore_edit_box.glade:821
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
-msgid "Which hour of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
-msgid "Minutes:"
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
+msgid "<b>TLSA Record Information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
-msgid "Which minute of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
-msgid "Seconds:"
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
-msgid "Which second of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_cert.glade:329
 msgid ""
-"Relative expiration time of the record.  The syntax is a number followed by "
-"a space and a time unit, possibly followed by additional numbers and time "
-"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
-"drop-down menu to select from a set of common defaults. (Editing is not "
-"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
-msgid "<b>Expiration Time</b>"
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
-msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
+#: contrib/gnunet_namestore_edit_cert.glade:378
+msgid "<b>DNS Domain Name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2199,35 +2912,35 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr ""
 
@@ -2235,196 +2948,223 @@ msgstr ""
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 msgid "Peer"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 msgid "Enter the phone line used for the user at the peer here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 msgid "<b>PHONE record</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 msgid "Enter the public key of the authority here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-msgid "<b>Service record (SRV)</b>"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 msgid "Peer:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+msgid "Edit"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 msgid "gnunet-namestore-gtk"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
-msgid "Preferred zone name (NICK):"
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
+msgid " _Select Zone"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 msgid "QR code for the selected zone"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+msgid "  _Edit Zone "
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-msgid "Edit"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
 msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
@@ -2753,105 +3493,110 @@ msgid ""
 "Daniel Nylander <address@hidden>\n"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 msgid "Address valid?"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 msgid "gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 msgid "Friend"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-msgid "State"
-msgstr ""
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 msgid "About gnunet-setup"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 msgid "gnunet-setup"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
 "use."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 msgid "File _Sharing"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+msgid "VPN"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:495
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -2862,431 +3607,452 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
 "\".gnunet\" TLD."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 msgid "<b>Service Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:733
-msgid "<b>Bandwidth Configuration</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
+msgid "_Proxy type:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:783
-msgid "Attempt automatic configuration"
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+msgid "Proxy username:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+msgid "Proxy password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1227
+msgid "<b>Proxy configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1248
+msgid "_Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1294
+msgid "Max. upload bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1018
-msgid "<b>NAT Traversal Configuration</b>"
+#: contrib/gnunet_setup_main_window.glade:1343
+msgid "<b>Bandwidth Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 msgid "Test configuration"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
 "can only work if you are not running your peer at the time you run the test."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+msgid "HTTP-Server"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2424
+msgid "HTTP-Client"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2625
+msgid "HTTPS-Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2891
+msgid "HTTPS-Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 msgid "<b>Transport Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 msgid "<b>File Sharing Options</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 msgid "gnunet"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 msgid "Configuration file:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 msgid "Username:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 msgid "Configuration:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 msgid "_File Sharing"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4184
+msgid "<b>VPN Interface Configuration</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3294,11 +4060,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3306,11 +4072,11 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 msgid "Tunnel DNS Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3321,166 +4087,132 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3486
-msgid "<b>VPN Interface Configuration</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+msgid "_VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
 "support before enabling this option."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
 "192.168.0.1/255.255.0.0).  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 msgid "<b>Exit policy</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 msgid "_Identifier"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 msgid "_Port"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 msgid "_Destination"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 msgid "GNS & N_amestore"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
@@ -3488,11 +4220,11 @@ msgstr ""
 msgid "About gnunet-statistics-gtk"
 msgstr ""
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 msgid "gnunet-statistics-gtk"
 msgstr ""
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr ""
 
@@ -3500,10 +4232,10 @@ msgstr ""
 msgid "_Connections"
 msgstr ""
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 msgid "_Traffic"
 msgstr ""
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 965382e9..bb712b56 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2007-06-24 21:24+0200\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,30 +16,181 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Välj alla filer"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ogiltig URI \"%s\""
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "Ogiltig URI \"%s\""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "Ogiltig URI \"%s\""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, c-format
+msgid "Adding contact failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+msgid "connected"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+#, fuzzy
+msgid "Failed to setup phone (internal error)"
+msgstr "Misslyckades att tolka angiven tidsintervall!"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, fuzzy, c-format
+msgid "Resolving `%s'."
+msgstr "Hämtar ner \"%s\""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, fuzzy, c-format
+msgid "Calling `%s'."
+msgstr "Laddar upp \"%s\""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr ""
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -47,12 +198,12 @@ msgid ""
 "be a C string\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, fuzzy, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr "Välj fil att publicera till GNUnet"
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 #, fuzzy
 msgid "no description supplied"
 msgstr "Samling stoppad.\n"
@@ -62,110 +213,110 @@ msgstr "Samling stoppad.\n"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "Misslyckades att läsa in instick \"%s\"\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 #, fuzzy
 msgid "_Download"
 msgstr "Hämta _ner"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 #, fuzzy
 msgid "Download _recursively"
 msgstr "r_ekursivt"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 #, fuzzy
 msgid "Download _as..."
 msgstr "Hämta _ner"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 #, fuzzy
 msgid "_Abort download"
 msgstr "Hämta _ner"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr "_Kopiera URI till urklipp"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Pub_licera"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr "Misslyckades att skapa URI-namnrymd från \"%s\".\n"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "Misslyckades att läsa in instick \"%s\"\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, fuzzy, c-format
 msgid "Processed file `%s'.\n"
 msgstr "Fel vid åtkomst till filen \"%s\"."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 #, fuzzy
 msgid "Select a type"
 msgstr "Välj alla filer"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, fuzzy, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "Fel vid mappning av filen \"%s\" till minnet."
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr ""
 
@@ -174,116 +325,126 @@ msgstr ""
 msgid "Could not access indexed file `%s'\n"
 msgstr "Fel vid åtkomst till filen \"%s\"."
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Artist"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "Misslyckades att läsa in instick \"%s\"\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Artist"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, fuzzy, c-format
 msgid "Failed to load animation from file `%s'\n"
 msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "Ogiltig URI \"%s\""
 
-#: src/lib/glade.c:123
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "Misslyckades att läsa in instick \"%s\"\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
 
-#: src/main/gnunet-gtk.c:220
-#, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+#: src/lib/glade.c:133
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+msgid "<new zone>"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr "aldrig"
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf"
 msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, c-format
 msgid "Operation failed: `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+msgid "Failed to communicate with database"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "Misslyckades att öppna \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -291,50 +452,67 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2258
-#, c-format
-msgid "Got invalid record name `%s' from namestore\n"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Publiceringar</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 #, fuzzy
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr ""
 "Misslyckades att lägga till innehåll till namnrymd (konsultera loggarna).\n"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -350,16 +528,132 @@ msgstr ""
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+msgid "Name resolution failed\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, c-format
+msgid "Unsupported address family %d\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "Misslyckades att läsa in instick \"%s\"\n"
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:209
+#, fuzzy, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+
+#: src/setup/gnunet-setup.c:271
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "gnunet-gtk"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -391,485 +685,403 @@ msgid ""
 "server!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, fuzzy, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr "Välj fil att publicera till GNUnet"
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, fuzzy, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr "Välj fil att publicera till GNUnet"
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1255
-msgid "How many bytes per second are we allowed to transmit?"
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1267
-msgid "How many bytes per second are we allowed to receive?"
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1281
-msgid "Enable communication via TCP"
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1293
-msgid "Enable communication via UDP"
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1305
-msgid "Enable communication via HTTP as a server"
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1317
-msgid "Enable communication via HTTP as a client"
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1329
-msgid "Enable communication via HTTPS as a server"
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1341
-msgid "Enable communication via HTTPS as a client"
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1353
-msgid "Enable communication via DV"
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1365
-msgid "Enable communication via WLAN"
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1377
-msgid "Port we bind to for TCP"
+#: src/setup/gnunet-setup-options.c:1483
+msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
-msgid "Port visible to other peers"
+#: src/setup/gnunet-setup-options.c:1495
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1509
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1521
+msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
+#: src/setup/gnunet-setup-options.c:1533
+msgid "Enable communication via HTTP as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
+#: src/setup/gnunet-setup-options.c:1545
+msgid "Enable communication via HTTP as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
+#: src/setup/gnunet-setup-options.c:1557
+msgid "Enable communication via HTTPS as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
+#: src/setup/gnunet-setup-options.c:1569
+msgid "Enable communication via HTTPS as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1581
+msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
+#: src/setup/gnunet-setup-options.c:1593
+msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1605
+msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
+msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr ""
 "Hur viktig är filen (används för att prioritera data i den lokala "
 "datalagringen)."
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr ""
 "Hur viktig är filen (används för att prioritera data i den lokala "
 "datalagringen)."
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2180
+msgid "Should the PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 msgid "Specification of .gnunet hosted services"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:227
-#, fuzzy, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
-
-#: src/setup/gnunet-setup.c:279
-#, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "gnunet-gtk"
-
-#: src/setup/gnunet-setup.c:631
-#, fuzzy
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr "Starta konfigurations_guiden"
-
-#: src/setup/gnunet-setup.c:652
-#, fuzzy
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr "Starta konfigurations_guiden"
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr "Anslutningar"
+#: src/statistics/functions.c:519
+msgid "Connectivity"
+msgstr "Anslutningar"
 
 #: src/statistics/functions.c:520
 msgid "# connected nodes (100% = connection table size)"
@@ -928,7 +1140,7 @@ msgstr "Routingeffektivitet"
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr "Aktuell (röd) och genomsnittlig (grön) effektivitet (100% = perfekt)"
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 
@@ -937,6 +1149,19 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -946,6 +1171,7 @@ msgstr ""
 msgid "Developed by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -955,6 +1181,7 @@ msgstr ""
 msgid "Documented by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -964,6 +1191,7 @@ msgstr ""
 msgid "Translated by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -973,6 +1201,7 @@ msgstr ""
 msgid "Artwork by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -983,6 +1212,7 @@ msgstr ""
 msgid "Credits"
 msgstr "Visa tack"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -992,115 +1222,340 @@ msgstr "Visa tack"
 msgid "License"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Filnamn"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+#, fuzzy
+msgid "_Caller Identity"
+msgstr "Identitet"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+#, fuzzy
+msgid "<b>Caller Identity</b>"
+msgstr "<b>Tillgängligt innehåll</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "Status"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+msgid "resume"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<b>Konfiguration för GNUnet</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+#, fuzzy
+msgid "Terminate a conversation."
+msgstr "_Avancerad konfiguration"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<b>Konfiguration för GNUnet</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Typ"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "Namn"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr "Värde"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+#, fuzzy
+msgid "Public?"
+msgstr "Pub_licera"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<b>Publiceringar</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Uppladdningar</b>"
+
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 #, fuzzy
 msgid "_recursive"
 msgstr "r_ekursivt"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "_Allmänt"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "_Namnrymd"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 #, fuzzy
 msgid "_Publication type:"
 msgstr "_Publicering"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 #, fuzzy
 msgid "Select file"
 msgstr "Välj alla filer"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 #, fuzzy
 msgid "Preview:"
 msgstr "_Förhandsgranska:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "_Nyckelord:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 #, fuzzy
 msgid "_Index file:"
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 #, fuzzy
 msgid "_Root keyword:"
 msgstr "_Nyckelord:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 #, fuzzy
 msgid "A_nonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 #, fuzzy
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 #, fuzzy
 msgid "_Replication:"
 msgstr "Applikation"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 #, fuzzy
 msgid "Publication options:"
 msgstr "_Publicering"
@@ -1110,128 +1565,272 @@ msgstr "_Publicering"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Ange metadata (beskrivningar) för denna namnrymd"
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "_Namn:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
+#, fuzzy
+msgid "Normal"
+msgstr "Format"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+msgid "PDF documents"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:371
+#, fuzzy
+msgid "Copy selection"
+msgstr "_Samling"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 #, fuzzy
 msgid "gnunet-fs-gtk"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
+#: contrib/gnunet_fs_gtk_main_window.glade:438
 msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 #, fuzzy
 msgid "_File sharing"
 msgstr "Fil_delning"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
+#: contrib/gnunet_fs_gtk_main_window.glade:483
 #, fuzzy
 msgid "_Publish"
 msgstr "Pub_licera"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
+#: contrib/gnunet_fs_gtk_main_window.glade:486
 msgid "Publish files or directories on GNUnet"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 #, fuzzy
 msgid "_List indexed files"
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
+#: contrib/gnunet_fs_gtk_main_window.glade:515
 msgid "Download a file or directory with a known URI."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
+#: contrib/gnunet_fs_gtk_main_window.glade:526
 #, fuzzy
 msgid "_Open GNUnet directory"
 msgstr "Öppna GNUnet-katalog"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_fs_gtk_main_window.glade:529
 msgid ""
 "Use this option to browse a GNUnet directory file that has been previously "
 "downloaded."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_fs_gtk_main_window.glade:549
 msgid ""
 "Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
+#: contrib/gnunet_fs_gtk_main_window.glade:564
 #, fuzzy
 msgid "_Edit"
 msgstr "A_vsluta"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
+#: contrib/gnunet_fs_gtk_main_window.glade:575
 #, fuzzy
 msgid "Edit the system configuration."
-msgstr "Starta konfigurations_guiden"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
-msgstr ""
+msgstr "Starta konfigurations_guiden"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:275
+#: contrib/gnunet_fs_gtk_main_window.glade:599
 msgid "Show meta data in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
+#: contrib/gnunet_fs_gtk_main_window.glade:600
 msgid "Metadata"
 msgstr "Metadata"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
+#: contrib/gnunet_fs_gtk_main_window.glade:610
 msgid "Show preview (when available)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
+#: contrib/gnunet_fs_gtk_main_window.glade:611
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
+#: contrib/gnunet_fs_gtk_main_window.glade:621
 msgid "Show search box in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
 #, fuzzy
 msgid "Search"
 msgstr "Sö_k"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:323
+#: contrib/gnunet_fs_gtk_main_window.glade:647
 msgid "Display information about this version of gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:354
+#: contrib/gnunet_fs_gtk_main_window.glade:679
 #, fuzzy
 msgid "Namespace:"
 msgstr "_Namnrymd"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:395
+#: contrib/gnunet_fs_gtk_main_window.glade:725
 msgid ""
 "Remember the specified namespace for later.\n"
 "This operation will be executed using the anonymity level specified on the "
 "right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:415
+#: contrib/gnunet_fs_gtk_main_window.glade:746
 #, fuzzy
 msgid "Keywords:"
 msgstr "Nyckelord"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:459
+#: contrib/gnunet_fs_gtk_main_window.glade:787
 msgid ""
 "Search using the given keywords.  The search may be narrowed by the given "
 "mime type and/or restricted to a namespace.\n"
@@ -1239,229 +1838,74 @@ msgid ""
 "right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
 #, fuzzy
 msgid "Anonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:538
+#: contrib/gnunet_fs_gtk_main_window.glade:867
 #, fuzzy
 msgid "Mime-type:"
 msgstr "MIME-typ"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
 #: contrib/gnunet_fs_gtk_search_tab.glade:104
 msgid "Status"
 msgstr "Status"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:848
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
 #, fuzzy
 msgid "Download into:"
 msgstr "Hämta _ner"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:862
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
 msgid "Select a directory to download into"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:888
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
 #, fuzzy
 msgid "Download as:"
 msgstr "Hämta _ner"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:991
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
 #, fuzzy
 msgid "Recursive"
 msgstr "r_ekursivt"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
 #, fuzzy
 msgid "Download!"
 msgstr "Hämta _ner"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
 msgid "Thumbnail associated with the currently selected content"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
 #, fuzzy
 msgid "File meta data"
 msgstr "Metadata"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
-#, fuzzy
-msgid "Normal"
-msgstr "Format"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-msgid "PDF documents"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
-#, fuzzy
-msgid "Copy selection"
-msgstr "_Samling"
-
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 msgid "Enter the URI to be downloaded"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 #, fuzzy
 msgid "_URI:"
 msgstr "URI"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 #, fuzzy
 msgid "<b>Messages</b>"
 msgstr "Meddelanden"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr ""
 
@@ -1469,45 +1913,45 @@ msgstr ""
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 msgid "Publish content on GNUnet"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 #, fuzzy
 msgid "_Create empty directory"
 msgstr "Öppna GNUnet-katalog"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 #, fuzzy
 msgid "Add _Directory"
 msgstr "_Katalog"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1515,11 +1959,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1538,19 +1982,19 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 #, fuzzy
 msgid "Identifier:"
 msgstr "Identifierare:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1559,37 +2003,37 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "_Nästa identifierare:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 #, fuzzy
 msgid "Identifier"
 msgstr "Identifierare:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "_Nästa identifierare:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr "Beskrivning"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 #, fuzzy
 msgid "Make publication updateable"
 msgstr "Nästa publiseringsdatum"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1597,18 +2041,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "_Nästa identifierare:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1616,15 +2060,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 msgid ""
 "This button removes all keywords from all files and directories in this "
 "dialog.\n"
@@ -1635,49 +2079,76 @@ msgid ""
 "Note that meta data is unaffected when using this function."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 #, fuzzy
 msgid "_Cancel"
 msgstr "A_vancerat"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
 #, fuzzy
-msgid "Priority:"
-msgstr "_Prioritet:"
+msgid "Select directory to publish"
+msgstr "Välj den katalog du vill publisera."
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritet:"
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 #, fuzzy
 msgid "Index files"
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Publish file..."
 msgstr "Publiserat filnamn"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 msgid "Index file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 #, fuzzy
 msgid "Publishing"
 msgstr "Pub_licera"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1686,48 +2157,53 @@ msgstr ""
 msgid "Indexed files"
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 msgid "gnunet-gtk"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "_Statistik"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "Fil_delning"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+#, fuzzy
+msgid "Voice conversation"
+msgstr "_Avancerad konfiguration"
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfigurera d_emon"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 #, fuzzy
 msgid "Quit"
 msgstr "A_vsluta"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1735,231 +2211,236 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "Meddelanden"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 #, fuzzy
 msgid "Type:"
 msgstr "_Typ:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "_Värde:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Typ"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
-msgstr "Värde"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 #, fuzzy
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr "Metadata som beskriver namnrymden (används för annonsering)."
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "Namn"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Körande applikationer</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 msgid "Execute advertisement."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Filnamn"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "_Nästa identifierare:"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
 "change it later (based on the selected expiration values)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 #, fuzzy
 msgid "<b>Name</b>"
 msgstr "Meddelanden"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
 msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
 msgid "Record is public (visible to other users)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:285
 #: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
 msgid "Record is a shadow record (valid after other records expire)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
 msgid ""
 "A shadow record is a record which becomes valid in the future.  They are not "
 "used as long as a second non-expired record with the same name and type "
@@ -1970,52 +2451,61 @@ msgid ""
 "becomes valid at midnight."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "<b>Uppladdningar</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
 msgid "Relative"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
 msgid ""
 "Records with a relative expiration time (such as 1 week) are always valid "
 "for at least that time period into the future. In other words, the auto-"
@@ -2026,266 +2516,506 @@ msgid ""
 "entries for which you do not know a specific date when they will expire."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
-msgid "Absolute"
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
+msgid ""
+"Records with an absolute expiration time are valid until the specified date. "
+"You can change that date to an even later date, but you cannot set it to an "
+"earlier time (as other users may have cached the longer expiration time). "
+"Use absolute expiration times if you know that a particular record will only "
+"be valid until a particular day."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
+#, fuzzy
+msgid "Never"
+msgstr "aldrig"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
+msgid ""
+"Records can be set to be valid forever. This is great if you are worried "
+"about censorship or certain that the mapping will never change.  Note that "
+"if you set a public record to never expire, you cannot later change it (as "
+"other users are free to cache the old value forever)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
+msgid ""
+"Select the date on which you want this record to expire. At that date, you "
+"can then create a new mapping or have a shadow record go automatically into "
+"effect.  Note that for public records you cannot change the expiration time "
+"to an earlier date after the fact."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
+#, fuzzy
+msgid "Minutes:"
+msgstr "minuter"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
+#, fuzzy
+msgid "Seconds:"
+msgstr "sekunder"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
+msgid ""
+"Relative expiration time of the record.  The syntax is a number followed by "
+"a space and a time unit, possibly followed by additional numbers and time "
+"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
+"drop-down menu to select from a set of common defaults. (Editing is not "
+"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Publiceringar</b>"
+
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
+msgid ""
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+msgid "_Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+#, fuzzy
+msgid "<b>Service record (SRV)</b>"
+msgstr "<b>Konfiguration för GNUnet</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
-msgid ""
-"Records with an absolute expiration time are valid until the specified date. "
-"You can change that date to an even later date, but you cannot set it to an "
-"earlier time (as other users may have cached the longer expiration time). "
-"Use absolute expiration times if you know that a particular record will only "
-"be valid until a particular day."
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
 #, fuzzy
-msgid "Never"
-msgstr "aldrig"
+msgid "Selector:"
+msgstr "Välj förhandsgranskning"
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
-msgid ""
-"Records can be set to be valid forever. This is great if you are worried "
-"about censorship or certain that the mapping will never change.  Note that "
-"if you set a public record to never expire, you cannot later change it (as "
-"other users are free to cache the old value forever)."
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
-msgid ""
-"Select the date on which you want this record to expire. At that date, you "
-"can then create a new mapping or have a shadow record go automatically into "
-"effect.  Note that for public records you cannot change the expiration time "
-"to an earlier date after the fact."
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
-msgid "Hours:"
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
-msgid "Which hour of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
-#, fuzzy
-msgid "Minutes:"
-msgstr "minuter"
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
-msgid "Which minute of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
 #, fuzzy
-msgid "Seconds:"
-msgstr "sekunder"
+msgid "Certificate:"
+msgstr "Identifierare:"
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
-msgid "Which second of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_box.glade:821
 msgid ""
-"Relative expiration time of the record.  The syntax is a number followed by "
-"a space and a time unit, possibly followed by additional numbers and time "
-"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
-"drop-down menu to select from a set of common defaults. (Editing is not "
-"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
 #, fuzzy
-msgid "<b>Expiration Time</b>"
-msgstr "<b>Publiceringar</b>"
+msgid "<b>TLSA Record Information</b>"
+msgstr "<b>Konfiguration för GNUnet</b>"
+
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:329
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "Meddelanden"
+
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2295,35 +3025,35 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr ""
 
@@ -2331,204 +3061,231 @@ msgstr ""
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "_Parter"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 msgid "Enter the phone line used for the user at the peer here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Nyckelord</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 msgid "Enter the public key of the authority here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-#, fuzzy
-msgid "<b>Service record (SRV)</b>"
-msgstr "<b>Konfiguration för GNUnet</b>"
-
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 #, fuzzy
 msgid "Peer:"
 msgstr "_Parter"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+#, fuzzy
+msgid "Edit"
+msgstr "A_vsluta"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
-msgid "Preferred zone name (NICK):"
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
+#, fuzzy
+msgid " _Select Zone"
+msgstr "Välj alla filer"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 #, fuzzy
 msgid "QR code for the selected zone"
 msgstr "Stäng den valda sökningen"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+msgid "  _Edit Zone "
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-#, fuzzy
-msgid "Edit"
-msgstr "A_vsluta"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 #, fuzzy
@@ -3237,111 +3994,115 @@ msgstr ""
 "Phan Vinh Thinh <address@hidden>\n"
 "Daniel Nylander <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 #, fuzzy
 msgid "Address valid?"
 msgstr "Adress"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-peerinfo-gtk"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 msgid "Friend"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "Status"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
 "use."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Fil_delning"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+msgid "VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:495
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3352,444 +4113,467 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
 "\".gnunet\" TLD."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 #, fuzzy
 msgid "Min. connected friends:"
 msgstr "Nedkopplad från gnunetd.\n"
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "_Allmänt"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "_Allmänt"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:733
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
 #, fuzzy
-msgid "<b>Bandwidth Configuration</b>"
-msgstr "<b>Konfiguration för GNUnet</b>"
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr ""
+msgid "_Proxy type:"
+msgstr "_Publicering"
 
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:783
-#, fuzzy
-msgid "Attempt automatic configuration"
-msgstr "Starta konfigurations_guiden"
-
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "_Filnamn:"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+msgid "Proxy password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1248
+msgid "_Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1294
+msgid "Max. upload bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1018
+#: contrib/gnunet_setup_main_window.glade:1343
 #, fuzzy
-msgid "<b>NAT Traversal Configuration</b>"
+msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 #, fuzzy
 msgid "Test configuration"
 msgstr "_Avancerad konfiguration"
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
 "can only work if you are not running your peer at the time you run the test."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+msgid "HTTP-Server"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2424
+msgid "HTTP-Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2625
+msgid "HTTPS-Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2891
+msgid "HTTPS-Client"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Körande applikationer</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 #, fuzzy
 msgid "gnunet"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Välj konfigurationsfil för gnunetd"
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 #, fuzzy
 msgid "Username:"
 msgstr "_Filnamn:"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 #, fuzzy
 msgid "Configuration:"
 msgstr "Konfigurera d_emon"
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Fil_delning"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4184
+#, fuzzy
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<b>Konfiguration för GNUnet</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3797,11 +4581,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3809,12 +4593,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Ingående trafik"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3825,173 +4609,138 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3486
-#, fuzzy
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<b>Konfiguration för GNUnet</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+msgid "_VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
 "support before enabling this option."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
 "192.168.0.1/255.255.0.0).  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<b>Publiceringar</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "Identifierare:"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 msgid "_Port"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "Beskrivning"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 #, fuzzy
 msgid "GNS & N_amestore"
 msgstr "_Namnrymd"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 #, fuzzy
 msgid "Welcome to gnunet-setup."
 msgstr "Ansluten till gnunetd.\n"
@@ -4001,12 +4750,12 @@ msgstr "Ansluten till gnunetd.\n"
 msgid "About gnunet-statistics-gtk"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 #, fuzzy
 msgid "gnunet-statistics-gtk"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr ""
 
@@ -4015,16 +4764,36 @@ msgstr ""
 msgid "_Connections"
 msgstr "Anslutningar"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 #, fuzzy
 msgid "_Traffic"
 msgstr "Ingående trafik"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<b>Publiceringar</b>"
+
+#, fuzzy
+#~ msgid "Attempting fully-automatic, non-interactive network configuration\n"
+#~ msgstr "Starta konfigurations_guiden"
+
+#, fuzzy
+#~ msgid "attempt automatic configuration of the network and instantly exit"
+#~ msgstr "Starta konfigurations_guiden"
+
+#, fuzzy
+#~ msgid "Attempt automatic configuration"
+#~ msgstr "Starta konfigurations_guiden"
+
+#, fuzzy
+#~ msgid "<b>NAT Traversal Configuration</b>"
+#~ msgstr "<b>Konfiguration för GNUnet</b>"
+
+#, fuzzy
 #~ msgid "Enable automatic shortening"
 #~ msgstr "Avbryt auto_matiskt sökningen efter (s):"
 
@@ -4068,10 +4837,6 @@ msgstr ""
 #~ msgid "_Options"
 #~ msgstr "Anslutningar"
 
-#, fuzzy
-#~ msgid "<b>Domain Owner Information</b>"
-#~ msgstr "<b>Konfiguration för GNUnet</b>"
-
 #~ msgid "Country"
 #~ msgstr "Land"
 
@@ -4239,9 +5004,6 @@ msgstr ""
 #~ msgid "Choose the file you want to publish."
 #~ msgstr "Välj den fil du vill publisera."
 
-#~ msgid "Choose the directory you want to publish."
-#~ msgstr "Välj den katalog du vill publisera."
-
 #~ msgid "unknown"
 #~ msgstr "okänd"
 
@@ -4260,9 +5022,6 @@ msgstr ""
 #~ msgid "no name given"
 #~ msgstr "inget namn angivet"
 
-#~ msgid "Failed to parse given time interval!"
-#~ msgstr "Misslyckades att tolka angiven tidsintervall!"
-
 #~ msgid "Failed to start collection `%s' (consult logs)."
 #~ msgstr "Misslyckades att starta samling \"%s\" (konsultera loggarna)."
 
@@ -4296,9 +5055,6 @@ msgstr ""
 #~ msgid "Error opening file `%s'."
 #~ msgstr "Fel vid öppnandet av filen \"%s\"."
 
-#~ msgid "Downloading `%s'"
-#~ msgstr "Hämtar ner \"%s\""
-
 #~ msgid "ERROR: already downloading `%s'"
 #~ msgstr "FEL: hämtar redan \"%s\""
 
@@ -4321,9 +5077,6 @@ msgstr ""
 #~ msgid "Data in datastore (in percent of allowed quota)"
 #~ msgstr "Data i datalagring (i procent av tillåten kvot)"
 
-#~ msgid "Identity"
-#~ msgstr "Identitet"
-
 #~ msgid "Could not initialize libnotify\n"
 #~ msgstr "Kunde inte initiera libnotify\n"
 
@@ -4696,9 +5449,6 @@ msgstr ""
 #~ msgid "end collection (will not delete content already in the collection)"
 #~ msgstr "avsluta samling (kommer inte ta bort innehåll redan i samlingen)"
 
-#~ msgid "<b>Available content</b>"
-#~ msgstr "<b>Tillgängligt innehåll</b>"
-
 #~ msgid ""
 #~ "should GNUnet track available content (for publishing in namespaces)?"
 #~ msgstr ""
@@ -4792,9 +5542,6 @@ msgstr ""
 #~ msgid "Lists all of the keywords that will be used."
 #~ msgstr "Listar alla nyckelord som kommer att användas."
 
-#~ msgid "Select Preview"
-#~ msgstr "Välj förhandsgranskning"
-
 #~ msgid "File Information"
 #~ msgstr "Filinformation"
 
@@ -5061,9 +5808,6 @@ msgstr ""
 #~ "Du måste ange en katalog i konfigurationen i sektionen \"%s\" under \"%s"
 #~ "\"."
 
-#~ msgid "Uploading `%s'"
-#~ msgstr "Laddar upp \"%s\""
-
 #~ msgid "You must select some available content for publication first!"
 #~ msgstr "Du måste först välja något tillgängligt innehåll för publisering!"
 
diff --git a/po/tr.po b/po/tr.po
index b59037d7..feb02e58 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.0d.tr\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2006-11-02 21:03+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -18,30 +18,181 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Tüm dosyaları seçer"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Geçersiz betimleyici`%s'"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "Geçersiz betimleyici`%s'"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "Geçersiz betimleyici`%s'"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, c-format
+msgid "Adding contact failed: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+msgid "connected"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+#, fuzzy
+msgid "Failed to setup phone (internal error)"
+msgstr "Belirtilen sürede çözümlenemedi!"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, fuzzy, c-format
+msgid "Resolving `%s'."
+msgstr "`%s' indiriliyor"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, fuzzy, c-format
+msgid "Calling `%s'."
+msgstr "`%s' gönderiliyor"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr ""
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -49,12 +200,12 @@ msgid ""
 "be a C string\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 #, fuzzy
 msgid "no description supplied"
 msgstr "Albüm durdu.\n"
@@ -64,111 +215,111 @@ msgstr "Albüm durdu.\n"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "`%s' eklentisi yüklenemedi\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 #, fuzzy
 msgid "_Download"
 msgstr "İ_ndir"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 msgid "Download _recursively"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 #, fuzzy
 msgid "Download _as..."
 msgstr "İ_ndir"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 #, fuzzy
 msgid "_Abort download"
 msgstr "İ_ndir"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 #, fuzzy
 msgid "no URI"
 msgstr "Evrensel Özkaynak Betimleyici (URI)"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Yayanlanmamış dosya ismi"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr ""
 "`%s' betimleyicisinden isim alanının evrensel olarak geçerli betimleyicisi "
 "(URI) oluşturulamadı.\n"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "`%s' eklentisi yüklenemedi\n"
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, c-format
 msgid "Processed file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 #, fuzzy
 msgid "Select a type"
 msgstr "Tüm dosyaları seçer"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr ""
 
@@ -177,116 +328,126 @@ msgstr ""
 msgid "Could not access indexed file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Sanatçı"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "`%s' eklentisi yüklenemedi\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Sanatçı"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, fuzzy, c-format
 msgid "Failed to load animation from file `%s'\n"
 msgstr "`%s' için müdahale edilemiyor\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "Geçersiz betimleyici`%s'"
 
-#: src/lib/glade.c:123
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "`%s' eklentisi yüklenemedi\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
+msgstr "`%s' için müdahale edilemiyor\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
 
-#: src/main/gnunet-gtk.c:220
-#, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+#: src/lib/glade.c:133
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+msgid "<new zone>"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr "`%s' için müdahale edilemiyor\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf"
 msgstr "`%s' için müdahale edilemiyor\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, c-format
 msgid "Operation failed: `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+msgid "Failed to communicate with database"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "`%s' açılamadı.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr "`%s' için müdahale edilemiyor\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr "`%s' için müdahale edilemiyor\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -294,49 +455,66 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2258
-#, c-format
-msgid "Got invalid record name `%s' from namestore\n"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Çalışan Uygulamalar</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 #, fuzzy
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr "İçerik isim alanına yerleştirilemedi (günlük kayıtlarına bakınız)\n"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -352,16 +530,132 @@ msgstr ""
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+msgid "Name resolution failed\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, c-format
+msgid "Unsupported address family %d\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "`%s' eklentisi yüklenemedi\n"
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:209
+#, fuzzy, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/setup/gnunet-setup.c:271
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "GNUnet-gtk"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -393,477 +687,397 @@ msgid ""
 "server!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1255
-msgid "How many bytes per second are we allowed to transmit?"
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1267
-msgid "How many bytes per second are we allowed to receive?"
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1281
-msgid "Enable communication via TCP"
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1293
-msgid "Enable communication via UDP"
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1305
-msgid "Enable communication via HTTP as a server"
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1317
-msgid "Enable communication via HTTP as a client"
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1329
-msgid "Enable communication via HTTPS as a server"
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1341
-msgid "Enable communication via HTTPS as a client"
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1353
-msgid "Enable communication via DV"
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1365
-msgid "Enable communication via WLAN"
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1377
-msgid "Port we bind to for TCP"
+#: src/setup/gnunet-setup-options.c:1483
+msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
-msgid "Port visible to other peers"
+#: src/setup/gnunet-setup-options.c:1495
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1509
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1521
+msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
+#: src/setup/gnunet-setup-options.c:1533
+msgid "Enable communication via HTTP as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
+#: src/setup/gnunet-setup-options.c:1545
+msgid "Enable communication via HTTP as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
+#: src/setup/gnunet-setup-options.c:1557
+msgid "Enable communication via HTTPS as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
+#: src/setup/gnunet-setup-options.c:1569
+msgid "Enable communication via HTTPS as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1581
+msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
+#: src/setup/gnunet-setup-options.c:1593
+msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1605
+msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
+msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2180
+msgid "Should the PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 msgid "Specification of .gnunet hosted services"
 msgstr ""
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:227
-#, fuzzy, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr "`%s' için müdahale edilemiyor\n"
-
-#: src/setup/gnunet-setup.c:279
-#, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "`%s' için müdahale edilemiyor\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "GNUnet-gtk"
-
-#: src/setup/gnunet-setup.c:631
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:652
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr "Bağlanırlık"
+#: src/statistics/functions.c:519
+msgid "Connectivity"
+msgstr "Bağlanırlık"
 
 #: src/statistics/functions.c:520
 msgid "# connected nodes (100% = connection table size)"
@@ -918,7 +1132,7 @@ msgstr ""
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr ""
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 
@@ -927,6 +1141,19 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -936,6 +1163,7 @@ msgstr ""
 msgid "Developed by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -945,6 +1173,7 @@ msgstr ""
 msgid "Documented by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -954,6 +1183,7 @@ msgstr ""
 msgid "Translated by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -963,6 +1193,7 @@ msgstr ""
 msgid "Artwork by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -973,6 +1204,7 @@ msgstr ""
 msgid "Credits"
 msgstr "Destekleyenleri göster"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -982,113 +1214,335 @@ msgstr "Destekleyenleri göster"
 msgid "License"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Dosya ismi"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+msgid "_Caller Identity"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+msgid "<b>Caller Identity</b>"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "D_urum"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+msgid "resume"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<b>Kullanılabilir İçerik</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+msgid "Terminate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<b>Kullanılabilir İçerik</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Türü"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "İsim"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+#, fuzzy
+msgid "Value"
+msgstr "_Değeri:"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+msgid "Public?"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<b>Çalışan Uygulamalar</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Gönderilenler</b>"
+
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Anonimlik:"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 msgid "_recursive"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "_Genel"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "_İsim alanı"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 #, fuzzy
 msgid "_Publication type:"
 msgstr "Sonraki Yayın Tarihi"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 #, fuzzy
 msgid "Select file"
 msgstr "Tüm dosyaları seçer"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 #, fuzzy
 msgid "Preview:"
 msgstr "_Önizleme:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "_Sözcük:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 #, fuzzy
 msgid "_Index file:"
 msgstr "_Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 #, fuzzy
 msgid "_Root keyword:"
 msgstr "_Sözcük:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 #, fuzzy
 msgid "A_nonymity:"
 msgstr "_Anonimlik:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 msgid "_Priority:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 #, fuzzy
 msgid "_Replication:"
 msgstr "Uygulama"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 #, fuzzy
 msgid "Publication options:"
 msgstr "Yayınlama Sıklığı"
@@ -1098,356 +1552,345 @@ msgstr "Yayınlama Sıklığı"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Bu isim alanı ile ilgili seçilen özniteliğin değerini yazınız."
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "İsi_m:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
-#, fuzzy
-msgid "gnunet-fs-gtk"
-msgstr "GNUnet-gtk"
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
-msgid "Your peer is currently not connected."
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
 #, fuzzy
-msgid "_File sharing"
-msgstr "Dosya _Paylaşımı"
+msgid "Normal"
+msgstr "Biçimi"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
-msgid "_Publish"
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
-msgid "Publish files or directories on GNUnet"
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
-#, fuzzy
-msgid "_List indexed files"
-msgstr "_Betimleyici:"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:191
-msgid "Download a file or directory with a known URI."
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
-msgid "_Open GNUnet directory"
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
-msgid ""
-"Use this option to browse a GNUnet directory file that has been previously "
-"downloaded."
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
-msgid ""
-"Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
-msgid "_Edit"
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+msgid "PDF documents"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
-msgid "Edit the system configuration."
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:275
-msgid "Show meta data in main window"
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
-msgid "Metadata"
-msgstr "Öznitelikler"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:286
-msgid "Show preview (when available)"
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
-msgid "Preview"
-msgstr "Önizleme"
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
-msgid "Show search box in main window"
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
-#, fuzzy
-msgid "Search"
-msgstr "A_ra"
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:323
-msgid "Display information about this version of gnunet-fs-gtk"
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:354
-#, fuzzy
-msgid "Namespace:"
-msgstr "_İsim alanı"
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:395
-msgid ""
-"Remember the specified namespace for later.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right."
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:415
-#, fuzzy
-msgid "Keywords:"
-msgstr "Anahtar Sözcükler"
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:459
-msgid ""
-"Search using the given keywords.  The search may be narrowed by the given "
-"mime type and/or restricted to a namespace.\n"
-"This operation will be executed using the anonymity level specified on the "
-"right.\n"
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
-#, fuzzy
-msgid "Anonymity:"
-msgstr "_Anonimlik:"
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:538
-#, fuzzy
-msgid "Mime-type:"
-msgstr "MIME türü"
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
-#: contrib/gnunet_fs_gtk_search_tab.glade:104
-#, fuzzy
-msgid "Status"
-msgstr "D_urum"
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:848
-#, fuzzy
-msgid "Download into:"
-msgstr "İ_ndir"
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:862
-#, fuzzy
-msgid "Select a directory to download into"
-msgstr "GNUnet'e gönderilecek dosyayı seçin"
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:888
+#: contrib/gnunet_fs_gtk_main_window.glade:371
 #, fuzzy
-msgid "Download as:"
-msgstr "İ_ndir"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:991
-msgid "Recursive"
-msgstr ""
+msgid "Copy selection"
+msgstr "Al_büm"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 #, fuzzy
-msgid "Download!"
-msgstr "İ_ndir"
+msgid "gnunet-fs-gtk"
+msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
-msgid "Thumbnail associated with the currently selected content"
+#: contrib/gnunet_fs_gtk_main_window.glade:438
+msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 #, fuzzy
-msgid "File meta data"
-msgstr "Öznitelikler"
+msgid "_File sharing"
+msgstr "Dosya _Paylaşımı"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
+#: contrib/gnunet_fs_gtk_main_window.glade:483
+msgid "_Publish"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
+#: contrib/gnunet_fs_gtk_main_window.glade:486
+msgid "Publish files or directories on GNUnet"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 #, fuzzy
-msgid "Normal"
-msgstr "Biçimi"
+msgid "_List indexed files"
+msgstr "_Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
+#: contrib/gnunet_fs_gtk_main_window.glade:515
+msgid "Download a file or directory with a known URI."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
+#: contrib/gnunet_fs_gtk_main_window.glade:526
+msgid "_Open GNUnet directory"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
+#: contrib/gnunet_fs_gtk_main_window.glade:529
+msgid ""
+"Use this option to browse a GNUnet directory file that has been previously "
+"downloaded."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
+#: contrib/gnunet_fs_gtk_main_window.glade:549
+msgid ""
+"Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
+#: contrib/gnunet_fs_gtk_main_window.glade:564
+msgid "_Edit"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
+#: contrib/gnunet_fs_gtk_main_window.glade:575
+msgid "Edit the system configuration."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-msgid "PDF documents"
+#: contrib/gnunet_fs_gtk_main_window.glade:599
+msgid "Show meta data in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
+#: contrib/gnunet_fs_gtk_main_window.glade:600
+msgid "Metadata"
+msgstr "Öznitelikler"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:610
+msgid "Show preview (when available)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:611
+msgid "Preview"
+msgstr "Önizleme"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
+#: contrib/gnunet_fs_gtk_main_window.glade:621
+msgid "Show search box in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
+#, fuzzy
+msgid "Search"
+msgstr "A_ra"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
+#: contrib/gnunet_fs_gtk_main_window.glade:647
+msgid "Display information about this version of gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:679
+#, fuzzy
+msgid "Namespace:"
+msgstr "_İsim alanı"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
+#: contrib/gnunet_fs_gtk_main_window.glade:725
+msgid ""
+"Remember the specified namespace for later.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:746
+#, fuzzy
+msgid "Keywords:"
+msgstr "Anahtar Sözcükler"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
+#: contrib/gnunet_fs_gtk_main_window.glade:787
+msgid ""
+"Search using the given keywords.  The search may be narrowed by the given "
+"mime type and/or restricted to a namespace.\n"
+"This operation will be executed using the anonymity level specified on the "
+"right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
+#, fuzzy
+msgid "Anonymity:"
+msgstr "_Anonimlik:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:867
+#, fuzzy
+msgid "Mime-type:"
+msgstr "MIME türü"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
+#: contrib/gnunet_fs_gtk_search_tab.glade:104
+#, fuzzy
+msgid "Status"
+msgstr "D_urum"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
+#, fuzzy
+msgid "Download into:"
+msgstr "İ_ndir"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
+#, fuzzy
+msgid "Select a directory to download into"
+msgstr "GNUnet'e gönderilecek dosyayı seçin"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
+#, fuzzy
+msgid "Download as:"
+msgstr "İ_ndir"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
+msgid "Recursive"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
+#, fuzzy
+msgid "Download!"
+msgstr "İ_ndir"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
+msgid "Thumbnail associated with the currently selected content"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
 #, fuzzy
-msgid "Copy selection"
-msgstr "Al_büm"
+msgid "File meta data"
+msgstr "Öznitelikler"
 
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 #, fuzzy
 msgid "Enter the URI to be downloaded"
 msgstr "Seçili indirmeyi iptal eder"
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 #, fuzzy
 msgid "_URI:"
 msgstr "Evrensel Özkaynak Betimleyici (URI)"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 #, fuzzy
 msgid "<b>Messages</b>"
 msgstr "İletiler"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr ""
 
@@ -1455,43 +1898,43 @@ msgstr ""
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 msgid "Publish content on GNUnet"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 msgid "_Create empty directory"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 msgid "Add _Directory"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1499,11 +1942,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1522,19 +1965,19 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 #, fuzzy
 msgid "Identifier:"
 msgstr "Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1543,36 +1986,36 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "_Sonraki Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 #, fuzzy
 msgid "Identifier"
 msgstr "Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "_Sonraki Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr "Açıklama"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 msgid "Make publication updateable"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1580,18 +2023,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "_Sonraki Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1599,15 +2042,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 msgid ""
 "This button removes all keywords from all files and directories in this "
 "dialog.\n"
@@ -1618,48 +2061,75 @@ msgid ""
 "Note that meta data is unaffected when using this function."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 #, fuzzy
 msgid "_Cancel"
 msgstr "Geli_şkin"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
-msgid "Priority:"
-msgstr ""
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
+#, fuzzy
+msgid "Select directory to publish"
+msgstr "GNUnet'e gönderilecek dosyayı seçin"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+msgid "Priority:"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 #, fuzzy
 msgid "Index files"
 msgstr "_Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Publish file..."
 msgstr "Yayanlanmamış dosya ismi"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 msgid "Index file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 #, fuzzy
 msgid "Publishing"
 msgstr "Yayanlanmamış dosya ismi"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1668,47 +2138,51 @@ msgstr ""
 msgid "Indexed files"
 msgstr "_Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "_Betimleyici:"
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 msgid "gnunet-gtk"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "İ_statistikler"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "Dosya _Paylaşımı"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+msgid "Voice conversation"
+msgstr ""
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 msgid "Quit"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1716,554 +2190,807 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "İletiler"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 #, fuzzy
 msgid "Type:"
 msgstr "_Öznitelik:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "_Değeri:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Türü"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-#, fuzzy
-msgid "Value"
-msgstr "_Değeri:"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "İsim"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Çalışan Uygulamalar</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 msgid "Execute advertisement."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Dosya ismi"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "_Sonraki Betimleyici:"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
 "change it later (based on the selected expiration values)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 #, fuzzy
 msgid "<b>Name</b>"
 msgstr "İletiler"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
+msgid ""
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:267
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
+msgid ""
+"A shadow record is a record which becomes valid in the future.  They are not "
+"used as long as a second non-expired record with the same name and type "
+"exists. This is useful if a mapping is to be changed as soon as an existing "
+"record expires. For example, if a users are supposed to switch at midnight "
+"from one IP address to another, two records would be placed into the system: "
+"one that is valid until midnight, and a second \"shadow\" record that "
+"becomes valid at midnight."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Gönderilenler</b>"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
+msgid ""
+"Records with a relative expiration time (such as 1 week) are always valid "
+"for at least that time period into the future. In other words, the auto-"
+"renew their own expiration to the given time period into the future. When "
+"you convert a public record with a relative expiration time to one with an "
+"absolute expiration time, the earliest possible expiration will be the "
+"respective relative time in the future. Use relative expiration times for "
+"entries for which you do not know a specific date when they will expire."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
+msgid ""
+"Records with an absolute expiration time are valid until the specified date. "
+"You can change that date to an even later date, but you cannot set it to an "
+"earlier time (as other users may have cached the longer expiration time). "
+"Use absolute expiration times if you know that a particular record will only "
+"be valid until a particular day."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
+msgid ""
+"Records can be set to be valid forever. This is great if you are worried "
+"about censorship or certain that the mapping will never change.  Note that "
+"if you set a public record to never expire, you cannot later change it (as "
+"other users are free to cache the old value forever)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
+msgid ""
+"Select the date on which you want this record to expire. At that date, you "
+"can then create a new mapping or have a shadow record go automatically into "
+"effect.  Note that for public records you cannot change the expiration time "
+"to an earlier date after the fact."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
+msgid "Minutes:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
+msgid "Seconds:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
+msgid ""
+"Relative expiration time of the record.  The syntax is a number followed by "
+"a space and a time unit, possibly followed by additional numbers and time "
+"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
+"drop-down menu to select from a set of common defaults. (Editing is not "
+"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Çalışan Uygulamalar</b>"
+
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
 msgid ""
 "Enter the IPv4 address for the A record here. The format is the usual dotted-"
 "decimal format (i.e. 127.0.0.1)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+msgid "_Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+#, fuzzy
+msgid "<b>Service record (SRV)</b>"
+msgstr "<b>Kullanılabilir İçerik</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
-msgid "Record is public (visible to other users)"
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:285
-#: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
-msgid "Record is a shadow record (valid after other records expire)"
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
-msgid ""
-"A shadow record is a record which becomes valid in the future.  They are not "
-"used as long as a second non-expired record with the same name and type "
-"exists. This is useful if a mapping is to be changed as soon as an existing "
-"record expires. For example, if a users are supposed to switch at midnight "
-"from one IP address to another, two records would be placed into the system: "
-"one that is valid until midnight, and a second \"shadow\" record that "
-"becomes valid at midnight."
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
 #, fuzzy
-msgid "<b>Options</b>"
-msgstr "<b>Gönderilenler</b>"
+msgid "Selector:"
+msgstr "Önizlemeyi Seç"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
-msgid "Relative"
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
-msgid ""
-"Records with a relative expiration time (such as 1 week) are always valid "
-"for at least that time period into the future. In other words, the auto-"
-"renew their own expiration to the given time period into the future. When "
-"you convert a public record with a relative expiration time to one with an "
-"absolute expiration time, the earliest possible expiration will be the "
-"respective relative time in the future. Use relative expiration times for "
-"entries for which you do not know a specific date when they will expire."
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
-msgid "Absolute"
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
-msgid ""
-"Records with an absolute expiration time are valid until the specified date. "
-"You can change that date to an even later date, but you cannot set it to an "
-"earlier time (as other users may have cached the longer expiration time). "
-"Use absolute expiration times if you know that a particular record will only "
-"be valid until a particular day."
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
-msgid "Never"
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
-msgid ""
-"Records can be set to be valid forever. This is great if you are worried "
-"about censorship or certain that the mapping will never change.  Note that "
-"if you set a public record to never expire, you cannot later change it (as "
-"other users are free to cache the old value forever)."
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
-msgid ""
-"Select the date on which you want this record to expire. At that date, you "
-"can then create a new mapping or have a shadow record go automatically into "
-"effect.  Note that for public records you cannot change the expiration time "
-"to an earlier date after the fact."
-msgstr ""
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
+#, fuzzy
+msgid "Certificate:"
+msgstr "Betimleyici:"
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
-msgid "Hours:"
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
-msgid "Which hour of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:821
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
-msgid "Minutes:"
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
-msgid "Which minute of the day selected above should the record expire?"
-msgstr ""
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
+#, fuzzy
+msgid "<b>TLSA Record Information</b>"
+msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
-msgid "Seconds:"
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
-msgid "Which second of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
-msgid ""
-"Relative expiration time of the record.  The syntax is a number followed by "
-"a space and a time unit, possibly followed by additional numbers and time "
-"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
-"drop-down menu to select from a set of common defaults. (Editing is not "
-"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
-#, fuzzy
-msgid "<b>Expiration Time</b>"
-msgstr "<b>Çalışan Uygulamalar</b>"
-
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:329
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "İletiler"
+
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2273,35 +3000,35 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr ""
 
@@ -2309,202 +3036,229 @@ msgstr ""
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "asla"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 msgid "Enter the phone line used for the user at the peer here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Anahtar Sözcükler</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 msgid "Enter the public key of the authority here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-#, fuzzy
-msgid "<b>Service record (SRV)</b>"
-msgstr "<b>Kullanılabilir İçerik</b>"
-
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 #, fuzzy
 msgid "Peer:"
 msgstr "asla"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+msgid "Edit"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
-msgid "Preferred zone name (NICK):"
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
+#, fuzzy
+msgid " _Select Zone"
+msgstr "Tüm dosyaları seçer"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 #, fuzzy
 msgid "QR code for the selected zone"
 msgstr "Seçili aramayı kapatır"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+msgid "  _Edit Zone "
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-msgid "Edit"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
 msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
@@ -3185,110 +3939,114 @@ msgstr ""
 "Phan Vinh Thinh <address@hidden>\n"
 "Daniel Nylander <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 msgid "Address valid?"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-peerinfo-gtk"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 msgid "Friend"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "D_urum"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-setup"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
 "use."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Dosya _Paylaşımı"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+msgid "VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:495
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3299,437 +4057,462 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
 "\".gnunet\" TLD."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 #, fuzzy
 msgid "Min. connected friends:"
 msgstr "GNUnet artalan süreci ile bağlantı kesildi.\n"
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "_Genel"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "_Genel"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:733
-msgid "<b>Bandwidth Configuration</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
+#, fuzzy
+msgid "_Proxy type:"
+msgstr "Sonraki Yayın Tarihi"
 
-#: contrib/gnunet_setup_main_window.glade:783
-msgid "Attempt automatic configuration"
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "D_osya ismi:"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+msgid "Proxy password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1248
+msgid "_Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1294
+msgid "Max. upload bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1018
-msgid "<b>NAT Traversal Configuration</b>"
+#: contrib/gnunet_setup_main_window.glade:1343
+msgid "<b>Bandwidth Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 msgid "Test configuration"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
 "can only work if you are not running your peer at the time you run the test."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+msgid "HTTP-Server"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2424
+msgid "HTTP-Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2625
+msgid "HTTPS-Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2891
+msgid "HTTPS-Client"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 msgid "<b>Transport Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Çalışan Uygulamalar</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 #, fuzzy
 msgid "gnunet"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 msgid "Configuration file:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 #, fuzzy
 msgid "Username:"
 msgstr "D_osya ismi:"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 msgid "Configuration:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Dosya _Paylaşımı"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4184
+#, fuzzy
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<b>Kullanılabilir İçerik</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3737,11 +4520,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3749,12 +4532,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Gelen Trafik"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3765,172 +4548,137 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3486
-#, fuzzy
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<b>Kullanılabilir İçerik</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+msgid "_VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
 "support before enabling this option."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
 "192.168.0.1/255.255.0.0).  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<b>Çalışan Uygulamalar</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "Betimleyici:"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 msgid "_Port"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "Açıklama"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 #, fuzzy
 msgid "GNS & N_amestore"
 msgstr "_İsim alanı"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 #, fuzzy
 msgid "Welcome to gnunet-setup."
 msgstr "GNUnet artalan sürecine bağlanıldı.\n"
@@ -3940,12 +4688,12 @@ msgstr "GNUnet artalan sürecine bağlanıldı.\n"
 msgid "About gnunet-statistics-gtk"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 #, fuzzy
 msgid "gnunet-statistics-gtk"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr ""
 
@@ -3954,16 +4702,20 @@ msgstr ""
 msgid "_Connections"
 msgstr "Bağlanırlık"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 #, fuzzy
 msgid "_Traffic"
 msgstr "Gelen Trafik"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<b>Çalışan Uygulamalar</b>"
+
+#, fuzzy
 #~ msgid "Failed to move record to target zone"
 #~ msgstr "`%s' eklentisi yüklenemedi\n"
 
@@ -3992,10 +4744,6 @@ msgstr ""
 #~ msgstr "Bağlanırlık"
 
 #, fuzzy
-#~ msgid "<b>Domain Owner Information</b>"
-#~ msgstr "<b>Kullanılabilir İçerik</b>"
-
-#, fuzzy
 #~ msgid "Advertise namespace"
 #~ msgstr "Bu _isim alanında:"
 
@@ -4388,9 +5136,6 @@ msgstr ""
 #~ msgid "Lists all of the keywords that will be used."
 #~ msgstr "Kullanılacak anahtar sözcüklerin tamamını listeler."
 
-#~ msgid "Select Preview"
-#~ msgstr "Önizlemeyi Seç"
-
 #~ msgid "File Information"
 #~ msgstr "Dosya Bilgileri"
 
@@ -4623,9 +5368,6 @@ msgstr ""
 #~ "`%2$s' altındaki `%1$s' bölümündeki yapılandırmada bir dizin "
 #~ "belirtmelisiniz."
 
-#~ msgid "Downloading `%s'"
-#~ msgstr "`%s' indiriliyor"
-
 #~ msgid "Please use the search function for keyword (KSK) URIs!"
 #~ msgstr ""
 #~ "Lütfen anahtar sözcük betimleyicilerini arama işlevini (KSK) kullanınız."
@@ -4659,9 +5401,6 @@ msgstr ""
 #~ msgid "Choose files to insert..."
 #~ msgstr "Yerleştirilecek dosyaları seçiniz..."
 
-#~ msgid "Uploading `%s'"
-#~ msgstr "`%s' gönderiliyor"
-
 #~ msgid "Choose the file you want to publish."
 #~ msgstr "Yayınlamak istediğiniz dosyayı seçiniz."
 
@@ -4674,9 +5413,6 @@ msgstr ""
 #~ msgid "--no update--"
 #~ msgstr "-- güncelleme yok --"
 
-#~ msgid "Failed to parse given time interval!"
-#~ msgstr "Belirtilen sürede çözümlenemedi!"
-
 #~ msgid "Failed to start collection `%s' (consult logs)."
 #~ msgstr "`%s' albümü başlatılamadı (günlük kayıtlarına bakınız)."
 
diff --git a/po/vi.po b/po/vi.po
index 90c3192d..00b5b2e4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:07+0200\n"
+"POT-Creation-Date: 2018-06-05 23:30+0200\n"
 "PO-Revision-Date: 2010-02-11 21:43+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -20,30 +20,181 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: src/fs/gnunet-fs-gtk.c:470
+#: src/conversation/gnunet-conversation-gtk.c:178
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk.c:183
+#, fuzzy
+msgid "select ego to use"
+msgstr "Chọn mọi tập tin"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:376
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "URI không hợp lệ « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_contacts.c:390
+#, fuzzy, c-format
+msgid "Invalid label `%s' in URI `%s'\n"
+msgstr "URI không hợp lệ « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:54
+#: src/conversation/gnunet-conversation-gtk_import.c:269
+#: src/conversation/gnunet-conversation-gtk_import.c:437
+#: src/conversation/gnunet-conversation-gtk_phone.c:884
+msgid "Error communicating with namestore!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:80
+#, c-format
+msgid "Label `%s' in use\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_get_label.c:127
+#: src/conversation/gnunet-conversation-gtk_phone.c:1718
+#, fuzzy, c-format
+msgid "Invalid label `%s'\n"
+msgstr "URI không hợp lệ « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:113
+#: src/conversation/gnunet-conversation-gtk_import.c:148
+#, fuzzy, c-format
+msgid "Adding contact failed: %s\n"
+msgstr "Lỗi tải lên tập tin: « %s »"
+
+#: src/conversation/gnunet-conversation-gtk_import.c:114
+msgid "record exists"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:142
+#, c-format
+msgid "Domain name `%s' invalid\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:149
+msgid "previous operation still pending"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:179
+#, c-format
+msgid "Failed to create CNAME record for domain name `%s'\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_import.c:223
+#, fuzzy, c-format
+msgid "Failed to publish my PHONE record: %s\n"
+msgstr "Lỗi tạo sổ theo dõi « namespace.Consult »."
+
+#: src/conversation/gnunet-conversation-gtk_import.c:383
+#, fuzzy, c-format
+msgid "Failed to remove PHONE record: %s\n"
+msgstr "Lỗi tạo sổ theo dõi « namespace.Consult »."
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:372
+#: src/conversation/gnunet-conversation-gtk_phone.c:400
+msgid "none"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:374
+msgid "ringing"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:376
+#: src/conversation/gnunet-conversation-gtk_phone.c:406
+#, fuzzy
+msgid "connected"
+msgstr "<b>Bị ngắt kết nối</b>"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:378
+#: src/conversation/gnunet-conversation-gtk_phone.c:408
+msgid "suspended"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:380
+#: src/conversation/gnunet-conversation-gtk_phone.c:410
+msgid "on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:382
+#: src/conversation/gnunet-conversation-gtk_phone.c:412
+msgid "suspended and on hold"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:402
+msgid "resolving"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:404
+msgid "calling"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:470
+#, c-format
+msgid "The phone is ringing (%u calls waiting)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:480
+msgid "We are listening for incoming calls"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:487
+msgid "No ego selected, phone is down."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:492
+msgid "Failed to setup phone (internal error)"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:508
+#: src/conversation/gnunet-conversation-gtk_phone.c:540
+#, c-format
+msgid "In a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:515
+#: src/conversation/gnunet-conversation-gtk_phone.c:547
+#, c-format
+msgid "On hold in a conversation with `%s'."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:532
+#, fuzzy, c-format
+msgid "Resolving `%s'."
+msgstr "Đang tải xuống « %s »\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:536
+#, fuzzy, c-format
+msgid "Calling `%s'."
+msgstr "Đang tải xuống « %s »\n"
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1784
+msgid "No phone line specified in configuration!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-gtk_phone.c:1789
+#, c-format
+msgid "Initializing phone on line %llu\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk.c:459
 msgid "GNUnet node appears to be on."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:471
+#: src/fs/gnunet-fs-gtk.c:460
 msgid "Currently running services:\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:550
+#: src/fs/gnunet-fs-gtk.c:539
 msgid "Can't connect to the Automatic Restart Manager service."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:658
+#: src/fs/gnunet-fs-gtk.c:661
 msgid ""
 "No default ego specified for `fs-sks` service, will not enable namespace "
 "search.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk.c:847 src/identity/gnunet-identity-gtk.c:556
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1318
-#: src/statistics/gnunet-statistics-gtk.c:293
-msgid "start in tray mode"
-msgstr ""
-
 #: src/fs/gnunet-fs-gtk_common.c:56
 #, c-format
 msgid ""
@@ -51,12 +202,12 @@ msgid ""
 "be a C string\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:203
+#: src/fs/gnunet-fs-gtk_common.c:205
 #, c-format
 msgid "Selected file `%s' is not a GNUnet directory!\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_common.c:249 src/fs/gnunet-fs-gtk_common.c:258
+#: src/fs/gnunet-fs-gtk_common.c:250 src/fs/gnunet-fs-gtk_common.c:259
 #, fuzzy
 msgid "no description supplied"
 msgstr "Thu thập bị dừng.\n"
@@ -66,110 +217,110 @@ msgstr "Thu thập bị dừng.\n"
 msgid "Failed to parse URI `%.*s': %s\n"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1246
+#: src/fs/gnunet-fs-gtk_event-handler.c:1249
 #, c-format
 msgid "URI #%d: %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:188
+#: src/fs/gnunet-fs-gtk_event-handler.c:1345
+#: contrib/gnunet_fs_gtk_main_window.glade:512
 #, fuzzy
 msgid "_Download"
 msgstr "Tải _xuống"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1337
+#: src/fs/gnunet-fs-gtk_event-handler.c:1356
 #, fuzzy
 msgid "Download _recursively"
 msgstr "đệ _quy"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1347
+#: src/fs/gnunet-fs-gtk_event-handler.c:1366
 #, fuzzy
 msgid "Download _as..."
 msgstr "Tải _xuống"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1379
+#: src/fs/gnunet-fs-gtk_event-handler.c:1398
 #, fuzzy
 msgid "_Abort download"
 msgstr "Tải _xuống"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1390
-#: src/fs/gnunet-fs-gtk_event-handler.c:3720
+#: src/fs/gnunet-fs-gtk_event-handler.c:1409
+#: src/fs/gnunet-fs-gtk_event-handler.c:3882
 msgid "_Copy URI to Clipboard"
 msgstr "_Chép URI vào bảng nháp"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2082
+#: src/fs/gnunet-fs-gtk_event-handler.c:2155
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2284
+#: src/fs/gnunet-fs-gtk_event-handler.c:2359
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:3730
+#: src/fs/gnunet-fs-gtk_event-handler.c:3892
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "_Xuất bản"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:97
-#: src/fs/gnunet-fs-gtk_main-window-search.c:135
+#: src/fs/gnunet-fs-gtk_main-window-search.c:95
+#: src/fs/gnunet-fs-gtk_main-window-search.c:133
 #, fuzzy
 msgid "Failed to resolve namespace in time\n"
 msgstr "Lỗi tạo URI miền tên từ « %s ».\n"
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:197
-#: contrib/gnunet_fs_gtk_main_window.glade:1446
+#: src/fs/gnunet-fs-gtk_main-window-search.c:195
+#: contrib/gnunet_fs_gtk_main_window.glade:384
 msgid "<none>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:249
+#: src/fs/gnunet-fs-gtk_main-window-search.c:246
 #, c-format
 msgid "Invalid keyword string `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_main-window-search.c:385
+#: src/fs/gnunet-fs-gtk_main-window-search.c:380
 #, fuzzy, c-format
 msgid "Failed to save record: %s\n"
 msgstr "Lỗi tạo sổ theo dõi « namespace.Consult »."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1507
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1506
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1521
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1520
 #, c-format
 msgid "Failed to scan `%s' (access error). Skipping.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1545
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1544
 #, fuzzy, c-format
 msgid "Processed file `%s'.\n"
 msgstr "Lỗi truy cập tập tin « %s »."
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1566
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1565
 msgid "Operation failed (press cancel)\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-dialog.c:1574
+#: src/fs/gnunet-fs-gtk_publish-dialog.c:1573
 msgid "Scanner has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:544
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:549
 #, fuzzy
 msgid "Select a type"
 msgstr "Chọn mọi tập tin"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:546
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:551
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1049
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1065
 #, fuzzy, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "Lỗi ánh xạ tập tin « %s » vào bộ nhớ."
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1231
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1247
 msgid "<unnamed>"
 msgstr ""
 
@@ -178,116 +329,126 @@ msgstr ""
 msgid "Could not access indexed file `%s'\n"
 msgstr "Lỗi truy cập tập tin « %s »."
 
-#: src/identity/gnunet-identity-gtk.c:251
-#, fuzzy
-msgid "_Advertise"
-msgstr "Nghệ sĩ"
-
-#: src/identity/gnunet-identity-gtk.c:393
-msgid "Operation not completed due to shutdown\n"
-msgstr ""
-
-#: src/identity/gnunet-identity-gtk_advertise.c:203
+#: src/identity/gnunet-identity-gtk_advertise.c:207
 msgid "Aborting advertising operation due to shutdown.\n"
 msgstr ""
 
-#: src/identity/gnunet-identity-gtk_advertise.c:232
+#: src/identity/gnunet-identity-gtk_advertise.c:236
 #, fuzzy, c-format
 msgid "Failed to advertise ego: %s\n"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
+#: src/identity/gnunet-identity-gtk.c:246
+#, fuzzy
+msgid "_Advertise"
+msgstr "Nghệ sĩ"
+
+#: src/identity/gnunet-identity-gtk.c:386
+msgid "Operation not completed due to shutdown\n"
+msgstr ""
+
 #: src/lib/animations.c:146
 #, fuzzy, c-format
 msgid "Failed to load animation from file `%s'\n"
 msgstr "CẢNH BÁO : lỗi lấy thống kê kết nối từ trình nền gnunetd.\n"
 
-#: src/lib/eventloop.c:197
+#: src/lib/eventloop.c:204
 #, fuzzy, c-format
 msgid "Invalid plug name `%s'\n"
 msgstr "URI không hợp lệ « %s »"
 
-#: src/lib/glade.c:123
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/lib/eventloop.c:542
+#, fuzzy
+msgid "Failed to initialize GNUnet-GTK select\n"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/lib/os_installation.c:410
+#: src/lib/eventloop.c:570
 #, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+msgid "Ran out of handle space - g_poll() needs %d handles, has %d!\n"
 msgstr ""
 
-#: src/main/gnunet-gtk.c:220
-#, c-format
-msgid "Restarting crashed plugin `%s'\n"
-msgstr ""
+#: src/lib/glade.c:133
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
 #: src/namestore/gnunet-namestore-gtk.c:39
-msgid "<new name>"
+msgid "<new zone>"
 msgstr ""
 
 #: src/namestore/gnunet-namestore-gtk.c:45
+msgid "<new name>"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:51
 msgid "<new record>"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:50
+#: src/namestore/gnunet-namestore-gtk.c:56
 msgid "never"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:55
+#: src/namestore/gnunet-namestore-gtk.c:61
 msgid "invalid"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:553
+#: src/namestore/gnunet-namestore-gtk.c:618
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf\n"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:597
+#: src/namestore/gnunet-namestore-gtk.c:662
 #, fuzzy
 msgid "Failed to initialize QR-code pixbuf"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:725
-#: src/namestore/gnunet-namestore-gtk.c:730
+#: src/namestore/gnunet-namestore-gtk.c:788
+#: src/namestore/gnunet-namestore-gtk.c:793
 #, fuzzy, c-format
 msgid "Operation failed: `%s'\n"
 msgstr "Lỗi tải lên tập tin: « %s »"
 
-#: src/namestore/gnunet-namestore-gtk.c:811
+#: src/namestore/gnunet-namestore-gtk.c:870
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:856
-#: src/namestore/gnunet-namestore-gtk.c:1656
+#: src/namestore/gnunet-namestore-gtk.c:921
+#: src/namestore/gnunet-namestore-gtk.c:1797
 msgid "Record combination not permitted"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:857
+#: src/namestore/gnunet-namestore-gtk.c:922
 msgid ""
 "Given the existing records, adding a new record of this type is not allowed."
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1500
+#: src/namestore/gnunet-namestore-gtk.c:996
+msgid "Failed to communicate with database"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:997
+msgid "Check that your peer is configured correctly."
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:1638
 #, fuzzy, c-format
 msgid "Failed to find handler `%s'\n"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1594
+#: src/namestore/gnunet-namestore-gtk.c:1731
 #, fuzzy, c-format
 msgid "Failed to load plugin for record type %d\n"
 msgstr "CẢNH BÁO : lỗi lấy thống kê kết nối từ trình nền gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1606
+#: src/namestore/gnunet-namestore-gtk.c:1747
 #, fuzzy, c-format
 msgid "Failed to load dialog resource `%s'\n"
 msgstr "CẢNH BÁO : lỗi lấy thống kê kết nối từ trình nền gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-gtk.c:1657
+#: src/namestore/gnunet-namestore-gtk.c:1798
 msgid ""
 "Given the existing records, adding a new record of this type is not "
 "allowed.\n"
@@ -295,49 +456,66 @@ msgid ""
 "NS records in GNS can only co-exist with A and AAAA records.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:1746
-msgid "Unsupported record type"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-gtk.c:1800
+#: src/namestore/gnunet-namestore-gtk.c:1953
 #, c-format
 msgid "Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2091
+#: src/namestore/gnunet-namestore-gtk.c:2418
 #, c-format
-msgid "Name `%s' invalid for GNS (too long for a DNS label?)\n"
+msgid "Got invalid record name `%s' from namestore\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2258
-#, c-format
-msgid "Got invalid record name `%s' from namestore\n"
+#: src/namestore/gnunet-namestore-gtk.c:2673
+msgid "Name must not be empty\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2475
-msgid "No zones found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2676
+msgid "Name is not a syntactically valid DNS label\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2476
-#, c-format
-msgid "Zone `%s' not found.  Should I run the import script?"
+#: src/namestore/gnunet-namestore-gtk.c:2689
+msgid "Name already exists in the list\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2493
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Bài xuất bản</b>"
+#: src/namestore/gnunet-namestore-gtk.c:2696
+msgid "Name is assigned in the configuration file (see [GNS] section)\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2582
-#: src/namestore/gnunet-namestore-gtk.c:2590
+#: src/namestore/gnunet-namestore-gtk.c:2752
+#: src/namestore/gnunet-namestore-gtk.c:2762
 msgid "A pending namestore operation was not transmitted to the namestore.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-gtk.c:2776
+#: src/namestore/gnunet-namestore-gtk.c:2949
+msgid "Renaming zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3141
+msgid "Creating zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3269
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-gtk.c:3327
 #, fuzzy
 msgid "<b><big>Failed to connect to namestore</b></big>"
 msgstr "Lỗi chèn nội dung vào miền tên (xem bản ghi).\n"
 
+#: src/namestore/plugin_gtk_namestore_box.c:112
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) BOX record `%s'\n"
+msgstr "Lỗi tạo sổ theo dõi « namespace.Consult »."
+
+#: src/namestore/plugin_gtk_namestore_box.c:137
+#: src/namestore/plugin_gtk_namestore_box.c:170
+#: src/namestore/plugin_gtk_namestore_box.c:206
+#, c-format
+msgid "Boxed record type %u not supported\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_gns2dns.c:70
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
@@ -353,16 +531,133 @@ msgstr ""
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
+#: src/namestore/plugin_gtk_namestore_srv.c:108
+#, fuzzy, c-format
+msgid "Unable to parse (boxed) SRV record `%s'\n"
+msgstr "Lỗi tạo sổ theo dõi « namespace.Consult »."
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:225
+#, c-format
+msgid "Unable to parse (boxed) TLSA record `%s'\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:485
+msgid "Certificate value is not in hex...\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:504
+#, fuzzy, c-format
+msgid "Failed to initialize CERT: %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:515
+#, fuzzy, c-format
+msgid "Failed to parse CERT: %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:528
+#, fuzzy, c-format
+msgid "Failed to initialize PK: %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:539
+#, fuzzy, c-format
+msgid "Failed to parse PK: %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:850
+#, fuzzy
+msgid "Name resolution failed\n"
+msgstr "Lỗi tải lên tập tin: « %s »"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:876
+#, c-format
+msgid "Unsupported address family %d\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:899
+#, fuzzy, c-format
+msgid "Failed to connect to target address `%s': %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:924
+#, fuzzy, c-format
+msgid "Failed to initialize cipher suite: %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:954
+#: src/namestore/plugin_gtk_namestore_tlsa.c:962
+#: src/namestore/plugin_gtk_namestore_tlsa.c:966
+msgid "Server certificate type not supported\n"
+msgstr ""
+
+#: src/namestore/plugin_gtk_namestore_tlsa.c:973
+#, c-format
+msgid "TLS handshake failed: %s\n"
+msgstr ""
+
 #: src/namestore/plugin_gtk_namestore_vpn.c:70
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:1232
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1495
 #, fuzzy
 msgid "Failed to parse list of friends\n"
 msgstr "Lỗi tạo sổ theo dõi « namespace.Consult »."
 
+#: src/peerinfo/gnunet-peerinfo-gtk.c:1564
+msgid ""
+"show peers even if the are inactive and we know nothing except their public "
+"key"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:149 src/setup/gnunet-setup.c:257
+#: src/setup/gnunet-setup-options.c:421 src/setup/gnunet-setup-options.c:442
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:158 src/setup/gnunet-setup.c:173
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:209
+#, fuzzy, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr "CẢNH BÁO : lỗi lấy thống kê kết nối từ trình nền gnunetd.\n"
+
+#: src/setup/gnunet-setup.c:271
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/setup/gnunet-setup.c:282
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:292
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:391 src/setup/gnunet-setup.c:392
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:422
+#, fuzzy
+msgid "Failed to launch gnunet-peerinfo-gtk\n"
+msgstr "Giới thiệu gnunet-gtk"
+
+#: src/setup/gnunet-setup.c:524
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
 #: src/setup/gnunet-setup-exit-services.c:111
 #, c-format
 msgid "Option `%s' is not formatted correctly!\n"
@@ -394,492 +689,410 @@ msgid ""
 "server!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:358
+#: src/setup/gnunet-setup-options.c:380
 msgid "the hostlist server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:362
+#: src/setup/gnunet-setup-options.c:384
 msgid "the TCP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:366
+#: src/setup/gnunet-setup-options.c:388
 msgid "the HTTP transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:370
+#: src/setup/gnunet-setup-options.c:392
 msgid "the HTTPS transport plugin"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:398 src/setup/gnunet-setup-options.c:418
-#: src/setup/gnunet-setup.c:170 src/setup/gnunet-setup.c:265
-#, c-format
-msgid "Widget `%s' not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:406
+#: src/setup/gnunet-setup-options.c:429
 #, c-format
 msgid "Specified widget `%s' is not a checkbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:426
+#: src/setup/gnunet-setup-options.c:450
 #, c-format
 msgid "Specified widget `%s' is not a spinbutton\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:483
+#: src/setup/gnunet-setup-options.c:527
 #, c-format
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:532 src/setup/gnunet-setup-options.c:581
+#: src/setup/gnunet-setup-options.c:584 src/setup/gnunet-setup-options.c:642
 msgid "Invalid policy."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1102
+#: src/setup/gnunet-setup-options.c:1204
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1114
+#: src/setup/gnunet-setup-options.c:1216
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1126
+#: src/setup/gnunet-setup-options.c:1228
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1139
+#: src/setup/gnunet-setup-options.c:1241
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1152
+#: src/setup/gnunet-setup-options.c:1253
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1164
+#: src/setup/gnunet-setup-options.c:1265
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1176
+#: src/setup/gnunet-setup-options.c:1277
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1188
+#: src/setup/gnunet-setup-options.c:1289
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1200
+#: src/setup/gnunet-setup-options.c:1301
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1212
+#: src/setup/gnunet-setup-options.c:1313
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1244
+#: src/setup/gnunet-setup-options.c:1345
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1255
-msgid "How many bytes per second are we allowed to transmit?"
+#: src/setup/gnunet-setup-options.c:1356
+msgid "Do not use a proxy to download hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1267
-msgid "How many bytes per second are we allowed to receive?"
+#: src/setup/gnunet-setup-options.c:1369 src/setup/gnunet-setup-options.c:1714
+#: src/setup/gnunet-setup-options.c:1832
+msgid "Use an HTTP proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1281
-msgid "Enable communication via TCP"
+#: src/setup/gnunet-setup-options.c:1382
+msgid "Use an HTTP v1.0 (only) proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1293
-msgid "Enable communication via UDP"
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1727
+#: src/setup/gnunet-setup-options.c:1845
+msgid "Use a SOCKS v4 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1305
-msgid "Enable communication via HTTP as a server"
+#: src/setup/gnunet-setup-options.c:1408 src/setup/gnunet-setup-options.c:1740
+#: src/setup/gnunet-setup-options.c:1858
+msgid "Use a SOCKS v4a proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1317
-msgid "Enable communication via HTTP as a client"
+#: src/setup/gnunet-setup-options.c:1421 src/setup/gnunet-setup-options.c:1753
+#: src/setup/gnunet-setup-options.c:1871
+msgid "Use a SOCKS v5 proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1329
-msgid "Enable communication via HTTPS as a server"
+#: src/setup/gnunet-setup-options.c:1434 src/setup/gnunet-setup-options.c:1766
+#: src/setup/gnunet-setup-options.c:1884
+msgid "Use a SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1341
-msgid "Enable communication via HTTPS as a client"
+#: src/setup/gnunet-setup-options.c:1447 src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1897
+msgid "Specify hostname or IP (and optionally) port of the proxy"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1353
-msgid "Enable communication via DV"
+#: src/setup/gnunet-setup-options.c:1459 src/setup/gnunet-setup-options.c:1791
+#: src/setup/gnunet-setup-options.c:1909
+msgid "Specify username for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1365
-msgid "Enable communication via WLAN"
+#: src/setup/gnunet-setup-options.c:1471 src/setup/gnunet-setup-options.c:1803
+#: src/setup/gnunet-setup-options.c:1921
+msgid "Specify password for the proxy (if needed)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1377
-msgid "Port we bind to for TCP"
+#: src/setup/gnunet-setup-options.c:1483
+msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1389 src/setup/gnunet-setup-options.c:1512
-#: src/setup/gnunet-setup-options.c:1536 src/setup/gnunet-setup-options.c:1560
-msgid "Port visible to other peers"
+#: src/setup/gnunet-setup-options.c:1495
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1509
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1521
+msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1401
-msgid "Check if this peer is behind a NAT"
+#: src/setup/gnunet-setup-options.c:1533
+msgid "Enable communication via HTTP as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1413
-msgid "Check if the NAT has been configured manually to forward ports"
+#: src/setup/gnunet-setup-options.c:1545
+msgid "Enable communication via HTTP as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1425
-msgid "Enable NAT traversal with UPnP/PMP"
+#: src/setup/gnunet-setup-options.c:1557
+msgid "Enable communication via HTTPS as a server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1438
-msgid "Enable NAT traversal with ICMP as server"
+#: src/setup/gnunet-setup-options.c:1569
+msgid "Enable communication via HTTPS as a client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1451
-msgid "External (public) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1581
+msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1463
-msgid "Enable NAT traversal with ICMP as client"
+#: src/setup/gnunet-setup-options.c:1593
+msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1475
-msgid "Internal (private) IP address of the NAT"
+#: src/setup/gnunet-setup-options.c:1605
+msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1487
-msgid "Disable IPv6 support"
+#: src/setup/gnunet-setup-options.c:1617 src/setup/gnunet-setup-options.c:1641
+#: src/setup/gnunet-setup-options.c:1665 src/setup/gnunet-setup-options.c:1689
+msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1500
+#: src/setup/gnunet-setup-options.c:1629
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1524
+#: src/setup/gnunet-setup-options.c:1653
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1548
+#: src/setup/gnunet-setup-options.c:1677
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1574
+#: src/setup/gnunet-setup-options.c:1701
+msgid "Do not use a proxy with the HTTP plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1819
+msgid "Do not use a proxy for HTTPS plugin"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1935
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datastore?"
 msgstr ""
 "Tập tin này có mức quan trọng nào (dùng để đặt ưu tiên của dữ liệu trong kho "
 "dữ liệu cục bộ)."
 
-#: src/setup/gnunet-setup-options.c:1586
+#: src/setup/gnunet-setup-options.c:1947
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1598
+#: src/setup/gnunet-setup-options.c:1959
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1610
+#: src/setup/gnunet-setup-options.c:1971
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1622
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1634
+#: src/setup/gnunet-setup-options.c:1995
 #, fuzzy
 msgid "Configuration file for MySQL access"
 msgstr "Tập tin _cấu hình dùng cho gnunetd:"
 
-#: src/setup/gnunet-setup-options.c:1646
+#: src/setup/gnunet-setup-options.c:2007
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1658
+#: src/setup/gnunet-setup-options.c:2019
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1670
+#: src/setup/gnunet-setup-options.c:2031
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1682
+#: src/setup/gnunet-setup-options.c:2043
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1694 src/setup/gnunet-setup-options.c:1793
-#: src/setup/gnunet-setup-options.c:2108
+#: src/setup/gnunet-setup-options.c:2055 src/setup/gnunet-setup-options.c:2154
+#: src/setup/gnunet-setup-options.c:2481
 #, fuzzy
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "Tập tin _cấu hình dùng cho gnunetd:"
 
-#: src/setup/gnunet-setup-options.c:1707
+#: src/setup/gnunet-setup-options.c:2068
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1719
+#: src/setup/gnunet-setup-options.c:2080
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1732
+#: src/setup/gnunet-setup-options.c:2093
 #, fuzzy
 msgid "How many bytes are we allowed to store in the local datacache?"
 msgstr ""
 "Tập tin này có mức quan trọng nào (dùng để đặt ưu tiên của dữ liệu trong kho "
 "dữ liệu cục bộ)."
 
-#: src/setup/gnunet-setup-options.c:1745
+#: src/setup/gnunet-setup-options.c:2106
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1757
+#: src/setup/gnunet-setup-options.c:2118
 msgid "Use memory to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1769
+#: src/setup/gnunet-setup-options.c:2130
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1781
+#: src/setup/gnunet-setup-options.c:2142
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1807
-msgid "Should the VPN/PT be started automatically on startup?"
+#: src/setup/gnunet-setup-options.c:2168
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2180
+msgid "Should the PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1821
+#: src/setup/gnunet-setup-options.c:2194
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1835
+#: src/setup/gnunet-setup-options.c:2208
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1848
+#: src/setup/gnunet-setup-options.c:2221
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1860
+#: src/setup/gnunet-setup-options.c:2233
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1872
+#: src/setup/gnunet-setup-options.c:2245
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1884
+#: src/setup/gnunet-setup-options.c:2257
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1896
+#: src/setup/gnunet-setup-options.c:2269
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1908
+#: src/setup/gnunet-setup-options.c:2281
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1924
+#: src/setup/gnunet-setup-options.c:2297
 msgid ""
 "Activate the VPN exit to provide services and/or to enable others to use "
 "your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1937
+#: src/setup/gnunet-setup-options.c:2310
 msgid ""
 "IP address of the external DNS resolver to use (values from your resolve."
 "conf are usually appropriate))"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1950
+#: src/setup/gnunet-setup-options.c:2323
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:2336
 msgid ""
 "Name of the virtual interface the GNUnet exit service should create for "
 "traffic exiting the VPN to the Internet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:2348
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1987
+#: src/setup/gnunet-setup-options.c:2360
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1999
+#: src/setup/gnunet-setup-options.c:2372
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:2385
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:2399
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2039
+#: src/setup/gnunet-setup-options.c:2412
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2053
+#: src/setup/gnunet-setup-options.c:2426
 msgid ""
 "Which IPv4 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2067
+#: src/setup/gnunet-setup-options.c:2440
 msgid ""
 "Which IPv6 addresses and ports do you allow other users to send traffic "
 "towards (via the Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2084
+#: src/setup/gnunet-setup-options.c:2457
 msgid "Use sqLite to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2096
+#: src/setup/gnunet-setup-options.c:2469
 msgid "Use PostGres to store names"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2123
+#: src/setup/gnunet-setup-options.c:2496
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2139
+#: src/setup/gnunet-setup-options.c:2512
 #, fuzzy
 msgid "Specification of .gnunet hosted services"
 msgstr "Ở đây thì xác định vị trí của tập tin « gnunetd.conf »"
 
-#: src/setup/gnunet-setup-transport.c:184
-msgid "NAT traversal with ICMP Server succeeded.\n"
-msgstr ""
+#: src/statistics/functions.c:519
+msgid "Connectivity"
+msgstr "Khả năng kết nối"
 
-#: src/setup/gnunet-setup-transport.c:185
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:208
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:233
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:283
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:357
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:372
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:438
-msgid "upnpc found, enabling its use\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:439
-msgid "upnpc not found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:477
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:478
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:513
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-transport.c:514
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:179 src/setup/gnunet-setup.c:194
-#, c-format
-msgid "Invalid regular expression `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:227
-#, fuzzy, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
-msgstr "CẢNH BÁO : lỗi lấy thống kê kết nối từ trình nền gnunetd.\n"
-
-#: src/setup/gnunet-setup.c:279
-#, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Lỗi tìm bộ quản lý « %s »\n"
-
-#: src/setup/gnunet-setup.c:290
-#, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:300
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:519 src/setup/gnunet-setup.c:520
-msgid ""
-"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
-"allows it)"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:550
-#, fuzzy
-msgid "Failed to launch gnunet-peerinfo-gtk\n"
-msgstr "Giới thiệu gnunet-gtk"
-
-#: src/setup/gnunet-setup.c:631
-#, fuzzy
-msgid "Attempting fully-automatic, non-interactive network configuration\n"
-msgstr "Khởi chạy t_rợ lý cấu hình"
-
-#: src/setup/gnunet-setup.c:652
-#, fuzzy
-msgid "attempt automatic configuration of the network and instantly exit"
-msgstr "Khởi chạy t_rợ lý cấu hình"
-
-#: src/setup/gnunet-setup.c:656
-msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
-msgstr ""
-
-#: src/statistics/functions.c:519
-msgid "Connectivity"
-msgstr "Khả năng kết nối"
-
-#: src/statistics/functions.c:520
-msgid "# connected nodes (100% = connection table size)"
-msgstr "# nút đã kết nối (100% = kích cỡ bảng kết nối)"
+#: src/statistics/functions.c:520
+msgid "# connected nodes (100% = connection table size)"
+msgstr "# nút đã kết nối (100% = kích cỡ bảng kết nối)"
 
 #: src/statistics/functions.c:528
 msgid "System load"
@@ -933,7 +1146,7 @@ msgstr "Độ hữu hiệu định tuyến"
 msgid "Average (red) effectiveness (100% = perfect)"
 msgstr "Độ hữu hiệu trung bình (màu đỏ): 100% = hoàn toàn."
 
-#: src/statistics/gnunet-statistics-gtk.c:256
+#: src/statistics/gnunet-statistics-gtk.c:263
 msgid "Failed to initiate connection with statistics service\n"
 msgstr ""
 
@@ -942,6 +1155,19 @@ msgstr ""
 msgid "Connected to %Lu peers"
 msgstr "Có kết nối tới %Lu đồng đẳng"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:65
+#: contrib/gnunet_fs_gtk_about_window.glade:361
+#: contrib/gnunet_identity_gtk_about_window.glade:65
+#: contrib/gnunet_namestore_gtk_about_window.glade:65
+#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
+#: contrib/gnunet_setup_about_window.glade:65
+#: contrib/gnunet_statistics_gtk_about_window.glade:65
+msgid ""
+"License should be loaded here at runtime from the license file (no need to "
+"copy the whole GPL in here...)."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_about_window.glade:158
 #: contrib/gnunet_fs_gtk_about_window.glade:96
 #: contrib/gnunet_identity_gtk_about_window.glade:158
 #: contrib/gnunet_namestore_gtk_about_window.glade:158
@@ -951,6 +1177,7 @@ msgstr "Có kết nối tới %Lu đồng đẳng"
 msgid "Developed by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:190
 #: contrib/gnunet_fs_gtk_about_window.glade:128
 #: contrib/gnunet_identity_gtk_about_window.glade:190
 #: contrib/gnunet_namestore_gtk_about_window.glade:190
@@ -960,6 +1187,7 @@ msgstr ""
 msgid "Documented by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:223
 #: contrib/gnunet_fs_gtk_about_window.glade:161
 #: contrib/gnunet_identity_gtk_about_window.glade:223
 #: contrib/gnunet_namestore_gtk_about_window.glade:223
@@ -969,6 +1197,7 @@ msgstr ""
 msgid "Translated by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:256
 #: contrib/gnunet_fs_gtk_about_window.glade:194
 #: contrib/gnunet_identity_gtk_about_window.glade:256
 #: contrib/gnunet_namestore_gtk_about_window.glade:256
@@ -978,6 +1207,7 @@ msgstr ""
 msgid "Artwork by"
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:301
 #: contrib/gnunet_fs_gtk_about_window.glade:239
 #: contrib/gnunet_identity_gtk_about_window.glade:301
 #: contrib/gnunet_namestore_gtk_about_window.glade:301
@@ -988,6 +1218,7 @@ msgstr ""
 msgid "Credits"
 msgstr "Hiện công trạng"
 
+#: contrib/gnunet_conversation_gtk_about_window.glade:316
 #: contrib/gnunet_fs_gtk_about_window.glade:254
 #: contrib/gnunet_identity_gtk_about_window.glade:316
 #: contrib/gnunet_namestore_gtk_about_window.glade:316
@@ -997,115 +1228,341 @@ msgstr "Hiện công trạng"
 msgid "License"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_identity_gtk_about_window.glade:65
-#: contrib/gnunet_namestore_gtk_about_window.glade:65
-#: contrib/gnunet_peerinfo_gtk_about_window.glade:65
-#: contrib/gnunet_setup_about_window.glade:65
-#: contrib/gnunet_statistics_gtk_about_window.glade:65
+#: contrib/gnunet_conversation_gtk_enter_label.glade:7
+msgid "Enter the label that should be used for the contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_enter_label.glade:27
+msgid "_Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:92
+#: contrib/gnunet_identity_gtk_main_window.glade:32
+#, fuzzy
+msgid "_File"
+msgstr "Tên tập tin"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:116
+#: contrib/gnunet_fs_gtk_main_window.glade:589
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:126
+msgid "_Address Book"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:136
+#, fuzzy
+msgid "_Caller Identity"
+msgstr "Nhận diện"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:145
+msgid "_History"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:154
+msgid "_Logs"
+msgstr "Th_eo dõi"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:167
+#: contrib/gnunet_fs_gtk_main_window.glade:636
+#: contrib/gnunet_identity_gtk_main_window.glade:56
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:149
+#: contrib/gnunet_statistics_gtk_main_window.glade:26
+msgid "_Help"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:226
+msgid "Ego:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:239
 msgid ""
-"License should be loaded here at runtime from the license file (no need to "
-"copy the whole GPL in here...)."
+"Select the ego which is supposed to be used for outgoing calls.  This is the "
+"public key that you will be visible under to other users."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:260
+#: contrib/gnunet_namestore_edit_box.glade:271
+#: contrib/gnunet_namestore_edit_srv.glade:184
+msgid "Label:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:276
+msgid "phone"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:283
+msgid ""
+"Enter the label under which your phone should be published in your ego's "
+"zone here. The default is 'phone'."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:303
+msgid "Copy our phone address to the clipboard."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:323
+#, fuzzy
+msgid "<b>Caller Identity</b>"
+msgstr "<b>Nội dung có</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:394
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:384
+#, fuzzy
+msgid "State"
+msgstr "Trạng thái"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:409
+#: contrib/gnunet_conversation_gtk_main_window.glade:949
+msgid "Caller ID"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:447
+msgid "Status indicator"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:459
+msgid "> contact"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:464
+msgid "Copy the phone address of the selected caller to our address book."
 msgstr ""
 
+#: contrib/gnunet_conversation_gtk_main_window.glade:476
+msgid "accept"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:481
+msgid "Accept incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:493
+msgid "refuse"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:498
+msgid "Refuse incoming call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:510
+#, fuzzy
+msgid "resume"
+msgstr "Tiế_p tục"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:515
+msgid "Resume suspended call."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:550
+#, fuzzy
+msgid "<b>Active conversations</b>"
+msgstr "<b>Cấu hình Trình nền GNUnet</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:581
+#: contrib/gnunet_namestore_edit_box.glade:407
+#: contrib/gnunet_namestore_edit_srv.glade:317
+msgid "Target:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:594
+msgid ""
+"Enter the GNU Name System name of the person you want to call here to "
+"initiate a call. During a call, the name of the caller is shown here."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:612
+msgid "Initiate a conversation."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:631
+msgid "Suspend the call, putting the other person on hold."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:649
+#, fuzzy
+msgid "Terminate a conversation."
+msgstr "Cấu hình cấp c_ao"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:670
+#, fuzzy
+msgid "<b>Initiate conversation</b>"
+msgstr "<b>Cấu hình Trình nền GNUnet</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:706
+msgid "Pick which zone to use for the address book below."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:707
+msgid "Zone:"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:720
+msgid ""
+"Select the GNU Name System zone that should be used for resolving target "
+"names and to manage the address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:759
+msgid "This is your address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:771
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:286
+msgid "Type"
+msgstr "Kiểu"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:787
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:371
+#: contrib/gnunet_identity_gtk_main_window.glade:109
+msgid "Name"
+msgstr "Tên"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:804
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:297
+msgid "Value"
+msgstr "Giá trị"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:821
+#, fuzzy
+msgid "Public?"
+msgstr "_Xuất bản"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:852
+msgid "Add phone address from clipboard to address book."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:879
+msgid "Addressbook"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:911
+msgid ""
+"You can see your call activity during this session here. It is not stored "
+"after you close this window."
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:920
+msgid "Time"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:934
+msgid "#"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:960
+msgid "Event"
+msgstr ""
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:980
+#, fuzzy
+msgid "<b>History</b>"
+msgstr "<b>Bài xuất bản</b>"
+
+#: contrib/gnunet_conversation_gtk_main_window.glade:1026
+#, fuzzy
+msgid "<b>Logs</b>"
+msgstr "<b>Ứng dụng đang chạy</b>"
+
 #: contrib/gnunet_fs_gtk_download_as_dialog.glade:16
 msgid "Save file as..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:85
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:182
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:86
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:183
 msgid "_Anonymity:"
 msgstr "_Giấu tên:"
 
-#: contrib/gnunet_fs_gtk_download_as_dialog.glade:118
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:117
 #, fuzzy
 msgid "_recursive"
 msgstr "đệ _quy"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:41
+#: contrib/gnunet_fs_gtk_edit_publication.glade:59
 #, fuzzy
 msgid "Generic"
 msgstr "Chun_g"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:45
-#: contrib/gnunet_fs_gtk_main_window.glade:1295
+#: contrib/gnunet_fs_gtk_edit_publication.glade:63
+#: contrib/gnunet_fs_gtk_main_window.glade:233
 msgid "Text"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:49
+#: contrib/gnunet_fs_gtk_edit_publication.glade:67
 msgid "Music"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:53
+#: contrib/gnunet_fs_gtk_edit_publication.glade:71
 msgid "Video"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:57
-#: contrib/gnunet_fs_gtk_main_window.glade:1302
+#: contrib/gnunet_fs_gtk_edit_publication.glade:75
+#: contrib/gnunet_fs_gtk_main_window.glade:240
 msgid "Image"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:61
+#: contrib/gnunet_fs_gtk_edit_publication.glade:79
 msgid "Software"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:65
+#: contrib/gnunet_fs_gtk_edit_publication.glade:83
 #, fuzzy
 msgid "Namespace"
 msgstr "Miề_n tên"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:121
+#: contrib/gnunet_fs_gtk_edit_publication.glade:159
 #, fuzzy
 msgid "_Publication type:"
 msgstr "_Xuất bản"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:282
+#: contrib/gnunet_fs_gtk_edit_publication.glade:323
 #, fuzzy
 msgid "Select file"
 msgstr "Chọn mọi tập tin"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:330
+#: contrib/gnunet_fs_gtk_edit_publication.glade:369
 #, fuzzy
 msgid "Preview:"
 msgstr "_Xem thử :"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:362
+#: contrib/gnunet_fs_gtk_edit_publication.glade:402
 msgid "_Keyword:"
 msgstr "_Từ khóa:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:510
+#: contrib/gnunet_fs_gtk_edit_publication.glade:551
 #, fuzzy
 msgid "_Index file:"
 msgstr "Bộ nhận d_iện:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:551
+#: contrib/gnunet_fs_gtk_edit_publication.glade:593
 #, fuzzy
 msgid "_Root keyword:"
 msgstr "_Từ khóa:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:595
+#: contrib/gnunet_fs_gtk_edit_publication.glade:634
 #, fuzzy
 msgid "A_nonymity:"
 msgstr "_Giấu tên:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:653
+#: contrib/gnunet_fs_gtk_edit_publication.glade:692
 #, fuzzy
 msgid "_Priority:"
 msgstr "Ư_u tiên:"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:698
+#: contrib/gnunet_fs_gtk_edit_publication.glade:734
 msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:744
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:118
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:219
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:487
+#: contrib/gnunet_fs_gtk_edit_publication.glade:778
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:184
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:231
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:531
 #, fuzzy
 msgid "_Replication:"
 msgstr "Ứng dụng"
 
-#: contrib/gnunet_fs_gtk_edit_publication.glade:787
+#: contrib/gnunet_fs_gtk_edit_publication.glade:818
 #, fuzzy
 msgid "Publication options:"
 msgstr "_Xuất bản"
@@ -1115,130 +1572,274 @@ msgstr "_Xuất bản"
 msgid "Enter the desired nickname for the namespace"
 msgstr "Nhập siêu dữ liệu (mô tả) cho miền tên này"
 
-#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:29
+#: contrib/gnunet_fs_gtk_enter_nick_dialog.glade:30
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Tên"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:60
+msgid "None"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:168
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:62
+msgid "#AAAA00000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:171
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:65
+#, fuzzy
+msgid "Normal"
+msgstr "Định dạng"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:173
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+msgid "#000000000000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:176
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:70
+msgid "Paranoid"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:178
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:72
+msgid "#0000AAAA0000"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:226
+msgid "Any"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:227
+#: contrib/gnunet_fs_gtk_main_window.glade:228
+#: contrib/gnunet_fs_gtk_main_window.glade:229
+#: contrib/gnunet_fs_gtk_main_window.glade:270
+#: contrib/gnunet_fs_gtk_main_window.glade:271
+#: contrib/gnunet_fs_gtk_main_window.glade:291
+#: contrib/gnunet_fs_gtk_main_window.glade:292
+msgid " "
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:235
+#: contrib/gnunet_fs_gtk_main_window.glade:236
+#: contrib/gnunet_fs_gtk_main_window.glade:242
+#: contrib/gnunet_fs_gtk_main_window.glade:243
+msgid "N/A"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:247
+msgid "PDF documents"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:249
+#: contrib/gnunet_fs_gtk_main_window.glade:263
+#: contrib/gnunet_fs_gtk_main_window.glade:340
+#: contrib/gnunet_fs_gtk_main_window.glade:347
+msgid "lossless"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:250
+#: contrib/gnunet_fs_gtk_main_window.glade:264
+#: contrib/gnunet_fs_gtk_main_window.glade:278
+#: contrib/gnunet_fs_gtk_main_window.glade:285
+#: contrib/gnunet_fs_gtk_main_window.glade:306
+#: contrib/gnunet_fs_gtk_main_window.glade:313
+#: contrib/gnunet_fs_gtk_main_window.glade:320
+#: contrib/gnunet_fs_gtk_main_window.glade:327
+#: contrib/gnunet_fs_gtk_main_window.glade:334
+msgid "non-free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:254
+msgid "JPEG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:256
+#: contrib/gnunet_fs_gtk_main_window.glade:277
+#: contrib/gnunet_fs_gtk_main_window.glade:284
+#: contrib/gnunet_fs_gtk_main_window.glade:298
+#: contrib/gnunet_fs_gtk_main_window.glade:305
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+#: contrib/gnunet_fs_gtk_main_window.glade:319
+#: contrib/gnunet_fs_gtk_main_window.glade:326
+#: contrib/gnunet_fs_gtk_main_window.glade:333
+msgid "lossy"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:257
+#: contrib/gnunet_fs_gtk_main_window.glade:299
+#: contrib/gnunet_fs_gtk_main_window.glade:341
+#: contrib/gnunet_fs_gtk_main_window.glade:348
+msgid "free"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:261
+msgid "PNG image"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:268
+msgid "Audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:275
+msgid "OGG Vorbis audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:282
+msgid "MPEG audio"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:289
+msgid "Vorbis"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:296
+msgid "OGG Vorbis video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:303
+msgid "MPEG video (v2)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:310
+msgid "MPEG video (v4)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:317
+msgid "AVI video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:324
+msgid "ASF video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:331
+msgid "Flash video"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:338
+msgid "Tar archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:345
+msgid "Zip archive"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:371
+#, fuzzy
+msgid "Copy selection"
+msgstr "_Thu thập"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:417
 #, fuzzy
 msgid "gnunet-fs-gtk"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:114
+#: contrib/gnunet_fs_gtk_main_window.glade:438
 msgid "Your peer is currently not connected."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:152
+#: contrib/gnunet_fs_gtk_main_window.glade:476
 #, fuzzy
 msgid "_File sharing"
 msgstr "C_hia sẻ tập tin"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:159
+#: contrib/gnunet_fs_gtk_main_window.glade:483
 #, fuzzy
 msgid "_Publish"
 msgstr "_Xuất bản"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:162
+#: contrib/gnunet_fs_gtk_main_window.glade:486
 #, fuzzy
 msgid "Publish files or directories on GNUnet"
 msgstr "Xuất bản một tập tin qua GNUnet"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:175
+#: contrib/gnunet_fs_gtk_main_window.glade:499
 #, fuzzy
 msgid "_List indexed files"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:191
+#: contrib/gnunet_fs_gtk_main_window.glade:515
 msgid "Download a file or directory with a known URI."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:202
+#: contrib/gnunet_fs_gtk_main_window.glade:526
 #, fuzzy
 msgid "_Open GNUnet directory"
 msgstr "Mở một thư mục GNUnet từ một tập tin"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:205
+#: contrib/gnunet_fs_gtk_main_window.glade:529
 msgid ""
 "Use this option to browse a GNUnet directory file that has been previously "
 "downloaded."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:225
+#: contrib/gnunet_fs_gtk_main_window.glade:549
 msgid ""
 "Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:240
+#: contrib/gnunet_fs_gtk_main_window.glade:564
 #, fuzzy
 msgid "_Edit"
 msgstr "T_hoát"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:251
+#: contrib/gnunet_fs_gtk_main_window.glade:575
 #, fuzzy
-msgid "Edit the system configuration."
-msgstr "Khởi chạy t_rợ lý cấu hình"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:265
-msgid "_View"
-msgstr ""
+msgid "Edit the system configuration."
+msgstr "Khởi chạy t_rợ lý cấu hình"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:275
+#: contrib/gnunet_fs_gtk_main_window.glade:599
 msgid "Show meta data in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:276
+#: contrib/gnunet_fs_gtk_main_window.glade:600
 #, fuzzy
 msgid "Metadata"
 msgstr "Siêu dữ liệu"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:286
+#: contrib/gnunet_fs_gtk_main_window.glade:610
 msgid "Show preview (when available)"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:287
+#: contrib/gnunet_fs_gtk_main_window.glade:611
 msgid "Preview"
 msgstr "Xem thử"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:297
+#: contrib/gnunet_fs_gtk_main_window.glade:621
 msgid "Show search box in main window"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:298
-#: contrib/gnunet_fs_gtk_main_window.glade:455
+#: contrib/gnunet_fs_gtk_main_window.glade:622
+#: contrib/gnunet_fs_gtk_main_window.glade:783
 #, fuzzy
 msgid "Search"
 msgstr "_Tìm"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:312
-#: contrib/gnunet_identity_gtk_main_window.glade:56
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:123
-#: contrib/gnunet_statistics_gtk_main_window.glade:25
-msgid "_Help"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:323
+#: contrib/gnunet_fs_gtk_main_window.glade:647
 msgid "Display information about this version of gnunet-fs-gtk"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:354
+#: contrib/gnunet_fs_gtk_main_window.glade:679
 #, fuzzy
 msgid "Namespace:"
 msgstr "Miề_n tên"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:395
+#: contrib/gnunet_fs_gtk_main_window.glade:725
 msgid ""
 "Remember the specified namespace for later.\n"
 "This operation will be executed using the anonymity level specified on the "
 "right."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:415
+#: contrib/gnunet_fs_gtk_main_window.glade:746
 #, fuzzy
 msgid "Keywords:"
 msgstr "Từ khóa"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:459
+#: contrib/gnunet_fs_gtk_main_window.glade:787
 msgid ""
 "Search using the given keywords.  The search may be narrowed by the given "
 "mime type and/or restricted to a namespace.\n"
@@ -1246,229 +1847,74 @@ msgid ""
 "right.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:482
-#: contrib/gnunet_fs_gtk_main_window.glade:948
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:106
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:144
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:412
+#: contrib/gnunet_fs_gtk_main_window.glade:811
+#: contrib/gnunet_fs_gtk_main_window.glade:1276
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:149
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:162
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:462
 #, fuzzy
 msgid "Anonymity:"
 msgstr "_Giấu tên:"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:538
+#: contrib/gnunet_fs_gtk_main_window.glade:867
 #, fuzzy
 msgid "Mime-type:"
 msgstr "Kiểu MIME"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:669
-#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_main_window.glade:1004
+#: contrib/gnunet_fs_gtk_publish_tab.glade:70
 #: contrib/gnunet_fs_gtk_search_tab.glade:104
 msgid "Status"
 msgstr "Trạng thái"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:848
+#: contrib/gnunet_fs_gtk_main_window.glade:1182
 #, fuzzy
 msgid "Download into:"
 msgstr "Tải _xuống"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:862
+#: contrib/gnunet_fs_gtk_main_window.glade:1196
 msgid "Select a directory to download into"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:888
+#: contrib/gnunet_fs_gtk_main_window.glade:1220
 #, fuzzy
 msgid "Download as:"
 msgstr "Tải _xuống"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:991
+#: contrib/gnunet_fs_gtk_main_window.glade:1319
 #, fuzzy
 msgid "Recursive"
 msgstr "đệ _quy"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1017
+#: contrib/gnunet_fs_gtk_main_window.glade:1345
 #, fuzzy
 msgid "Download!"
 msgstr "Tải _xuống"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1058
+#: contrib/gnunet_fs_gtk_main_window.glade:1387
 msgid "Thumbnail associated with the currently selected content"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1072
+#: contrib/gnunet_fs_gtk_main_window.glade:1401
 #, fuzzy
 msgid "File meta data"
 msgstr "Hiển thị siêu dữ liệu"
 
-#: contrib/gnunet_fs_gtk_main_window.glade:1228
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:608
-msgid "None"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1230
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:610
-msgid "#AAAA00000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1233
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:613
-#, fuzzy
-msgid "Normal"
-msgstr "Định dạng"
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1235
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:615
-msgid "#000000000000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1238
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:618
-msgid "Paranoid"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1240
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:620
-msgid "#0000AAAA0000"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1288
-msgid "Any"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1289
-#: contrib/gnunet_fs_gtk_main_window.glade:1290
-#: contrib/gnunet_fs_gtk_main_window.glade:1291
-#: contrib/gnunet_fs_gtk_main_window.glade:1332
-#: contrib/gnunet_fs_gtk_main_window.glade:1333
-#: contrib/gnunet_fs_gtk_main_window.glade:1353
-#: contrib/gnunet_fs_gtk_main_window.glade:1354
-msgid " "
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1297
-#: contrib/gnunet_fs_gtk_main_window.glade:1298
-#: contrib/gnunet_fs_gtk_main_window.glade:1304
-#: contrib/gnunet_fs_gtk_main_window.glade:1305
-msgid "N/A"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1309
-msgid "PDF documents"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1311
-#: contrib/gnunet_fs_gtk_main_window.glade:1325
-#: contrib/gnunet_fs_gtk_main_window.glade:1402
-#: contrib/gnunet_fs_gtk_main_window.glade:1409
-msgid "lossless"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1312
-#: contrib/gnunet_fs_gtk_main_window.glade:1326
-#: contrib/gnunet_fs_gtk_main_window.glade:1340
-#: contrib/gnunet_fs_gtk_main_window.glade:1347
-#: contrib/gnunet_fs_gtk_main_window.glade:1368
-#: contrib/gnunet_fs_gtk_main_window.glade:1375
-#: contrib/gnunet_fs_gtk_main_window.glade:1382
-#: contrib/gnunet_fs_gtk_main_window.glade:1389
-#: contrib/gnunet_fs_gtk_main_window.glade:1396
-msgid "non-free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1316
-msgid "JPEG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1318
-#: contrib/gnunet_fs_gtk_main_window.glade:1339
-#: contrib/gnunet_fs_gtk_main_window.glade:1346
-#: contrib/gnunet_fs_gtk_main_window.glade:1360
-#: contrib/gnunet_fs_gtk_main_window.glade:1367
-#: contrib/gnunet_fs_gtk_main_window.glade:1374
-#: contrib/gnunet_fs_gtk_main_window.glade:1381
-#: contrib/gnunet_fs_gtk_main_window.glade:1388
-#: contrib/gnunet_fs_gtk_main_window.glade:1395
-msgid "lossy"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1319
-#: contrib/gnunet_fs_gtk_main_window.glade:1361
-#: contrib/gnunet_fs_gtk_main_window.glade:1403
-#: contrib/gnunet_fs_gtk_main_window.glade:1410
-msgid "free"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1323
-msgid "PNG image"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1330
-msgid "Audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1337
-msgid "OGG Vorbis audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1344
-msgid "MPEG audio"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1351
-msgid "Vorbis"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1358
-msgid "OGG Vorbis video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1365
-msgid "MPEG video (v2)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1372
-msgid "MPEG video (v4)"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1379
-msgid "AVI video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1386
-msgid "ASF video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1393
-msgid "Flash video"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1400
-msgid "Tar archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1407
-msgid "Zip archive"
-msgstr ""
-
-#: contrib/gnunet_fs_gtk_main_window.glade:1433
-#, fuzzy
-msgid "Copy selection"
-msgstr "_Thu thập"
-
 #: contrib/gnunet_fs_gtk_open_url_dialog.glade:15
 msgid "Enter the URI to be downloaded"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:38
 #, fuzzy
 msgid "_URI:"
 msgstr "URI"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:62
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:72
 #, fuzzy
 msgid "<b>Messages</b>"
 msgstr "<b>Siêu dữ liệu</b>"
 
-#: contrib/gnunet_fs_gtk_progress_dialog.glade:80
+#: contrib/gnunet_fs_gtk_progress_dialog.glade:88
 msgid "Preprocessing..."
 msgstr ""
 
@@ -1476,46 +1922,46 @@ msgstr ""
 msgid "Preparing to save namespace in GNS zone"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:32
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:31
 msgid "Trying to discover nickname..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:57
+#: contrib/gnunet_fs_gtk_pseu_progress_dialog.glade:55
 msgid "If you cancel this operation, you can enter a nickname manually."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:28
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:85
 #, fuzzy
 msgid "Publish content on GNUnet"
 msgstr "Xuất bản một tập tin qua GNUnet"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:118
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:181
 msgid "Add _File"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:129
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:196
 #, fuzzy
 msgid "_Create empty directory"
 msgstr "Mở một thư mục GNUnet từ một tập tin"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:145
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:213
 #, fuzzy
 msgid "Add _Directory"
 msgstr "Thư mục"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:228
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:291
 msgid "_Left"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:265
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:326
 msgid "_Right"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:416
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:392
 msgid "Publish in global namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:421
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:397
 msgid ""
 "Make unsigned publication that will be searchable in global (anonymous) "
 "namespace.\n"
@@ -1523,11 +1969,11 @@ msgid ""
 "before starting the publication."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:448
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:425
 msgid "Publish in your own namespace"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:454
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:431
 msgid ""
 "Sign the publication with one of your pseudonyms, and give it an identifier, "
 "under which it will be found in your namespace.\n"
@@ -1546,18 +1992,18 @@ msgid ""
 "requirements for published files.\n"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:510
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:489
 msgid ""
 "Name under which the publication will appear in your namespace. Equivalent "
 "to the keyword that is used when publishing in the global namespace."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:512
-#: contrib/gnunet_namestore_edit_vpn.glade:241
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:490
+#: contrib/gnunet_namestore_edit_vpn.glade:238
 msgid "Identifier:"
 msgstr "Bộ nhận diện:"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:525
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:504
 msgid ""
 "Identifier under which this publication will be found in your namespace.\n"
 "Publications made in your namespace use only these identifiers, one per "
@@ -1566,35 +2012,35 @@ msgid ""
 "previous updateable publications) in the list below."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:552
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:529
 msgid ""
 "Here you can find a list of previous publications you made in this "
 "namespace. This may be convenient if you want to publish an update."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:560
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:537
 #, fuzzy
 msgid "Previous identifiers"
 msgstr "Bộ nhận diện sau"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:588
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:568
 msgid "Identifier"
 msgstr "Bộ nhận diện"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:600
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:580
 #, fuzzy
 msgid "Update identifier"
 msgstr "Bộ nhận diện sau"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:612
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:592
 msgid "Description"
 msgstr "Mô tả"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:636
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:616
 msgid "Make publication updateable"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:642
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:622
 msgid ""
 "With the update mechanism, you can publish updates to a file that will be "
 "automatically located when a users searches for the original identifier.\n"
@@ -1602,18 +2048,18 @@ msgid ""
 "To enable updates, you must check this box and specify an update identifier."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:672
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:653
 msgid ""
 "Identifier under which you \"promise\" to publish an update to this "
 "publication at a later time."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:673
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:654
 #, fuzzy
 msgid "Update identifier:"
 msgstr "Bộ nhận diện sau"
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:686
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:667
 msgid ""
 "Identifier under which the updated version will be published later.\n"
 "GNUnet clients will use it to try to find updated version of this "
@@ -1621,15 +2067,15 @@ msgid ""
 "Leaving this field blank makes publication unupdateable."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:719
 msgid "_Execute"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:758
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:736
 msgid "Remove all _Keywords"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:763
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:741
 msgid ""
 "This button removes all keywords from all files and directories in this "
 "dialog.\n"
@@ -1640,51 +2086,78 @@ msgid ""
 "Note that meta data is unaffected when using this function."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_dialog.glade:778
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:756
 #, fuzzy
 msgid "_Cancel"
 msgstr "Cấp ca_o"
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:51
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:159
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:427
-#: contrib/gnunet_namestore_edit_srv.glade:232
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:28
 #, fuzzy
-msgid "Priority:"
-msgstr "Ư_u tiên:"
+msgid "Select directory to publish"
+msgstr "Chọn thư mục bạn muốn xuất bản."
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:80
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:190
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:458
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:100
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:205
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:505
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:196
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:112
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:136
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:197
+#: contrib/gnunet_namestore_edit_box.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:437
+#: contrib/gnunet_namestore_edit_box.glade:454
+#: contrib/gnunet_namestore_edit_box.glade:1076
+#: contrib/gnunet_namestore_edit_box.glade:1107
+#: contrib/gnunet_namestore_edit_box.glade:1138
+#: contrib/gnunet_namestore_edit_srv.glade:330
+#: contrib/gnunet_namestore_edit_srv.glade:347
+#: contrib/gnunet_namestore_edit_srv.glade:364
+#: contrib/gnunet_namestore_edit_srv.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:629
+#: contrib/gnunet_namestore_edit_srv.glade:660
+#: contrib/gnunet_namestore_edit_tlsa.glade:852
+#: contrib/gnunet_namestore_edit_tlsa.glade:883
+#: contrib/gnunet_namestore_edit_tlsa.glade:914
+msgid "0"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:124
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:177
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:477
+#: contrib/gnunet_namestore_edit_box.glade:374
+#: contrib/gnunet_namestore_edit_srv.glade:284
+#, fuzzy
+msgid "Priority:"
+msgstr "Ư_u tiên:"
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:208
 #, fuzzy
 msgid "Index files"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:9
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Publish file..."
 msgstr "Tên tập tin đã xuất bản"
 
-#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:71
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:88
 #, fuzzy
 msgid "Index file"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:55
+#: contrib/gnunet_fs_gtk_publish_tab.glade:58
 #, fuzzy
 msgid "Progress"
 msgstr "Tiến hành"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:108
+#: contrib/gnunet_fs_gtk_publish_tab.glade:111
 #, fuzzy
 msgid "Publishing"
 msgstr "_Xuất bản"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:222
+#: contrib/gnunet_fs_gtk_search_tab.glade:225
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1693,49 +2166,54 @@ msgstr ""
 msgid "Indexed files"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:57
+#: contrib/gnunet_fs_gtk_unindex.glade:58
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_gtk.glade:8
+#: contrib/gnunet_gtk.glade:7
 #, fuzzy
 msgid "gnunet-gtk"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_gtk.glade:31
+#: contrib/gnunet_gtk.glade:45
 #, fuzzy
 msgid "Statistics"
 msgstr "_Thống kê"
 
-#: contrib/gnunet_gtk.glade:56
+#: contrib/gnunet_gtk.glade:71
 msgid "Information about known and connected peers"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:82
+#: contrib/gnunet_gtk.glade:98
 msgid "GNU Name System Zone Management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:108
+#: contrib/gnunet_gtk.glade:125
 #, fuzzy
 msgid "File-Sharing"
 msgstr "C_hia sẻ tập tin"
 
-#: contrib/gnunet_gtk.glade:134
+#: contrib/gnunet_gtk.glade:152
 msgid "Identity management"
 msgstr ""
 
-#: contrib/gnunet_gtk.glade:159
+#: contrib/gnunet_gtk.glade:177
+#, fuzzy
+msgid "Voice conversation"
+msgstr "Cấu hình cấp c_ao"
+
+#: contrib/gnunet_gtk.glade:203
 #, fuzzy
 msgid "Configuration"
 msgstr "Cấu hình cấp c_ao"
 
-#: contrib/gnunet_gtk_status_bar_menu.glade:11
+#: contrib/gnunet_gtk_status_bar_menu.glade:14
 #, fuzzy
 msgid "Quit"
 msgstr "T_hoát"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:67
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:120
 msgid ""
 "The namespace root is the keyword/identifier suggested to the user by "
 "default when a search in this namespace is initiated. The idea is that it "
@@ -1743,231 +2221,236 @@ msgid ""
 "namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:81
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:132
 #, fuzzy
 msgid "<b>Namespace root</b>"
 msgstr "<b>Siêu dữ liệu</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:115
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:166
 #, fuzzy
 msgid "Type:"
 msgstr "_Kiểu :"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:146
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:197
 #, fuzzy
 msgid "Value:"
 msgstr "_Giá trị:"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:237
-msgid "Type"
-msgstr "Kiểu"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:248
-msgid "Value"
-msgstr "Giá trị"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:277
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:326
 #, fuzzy
 msgid "<b>Namespace description to use in advertisement:</b>"
 msgstr "Siêu dữ liệu mô tả miền tên (dùng trong lời giới thiệu quảng cáo)."
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:321
-#: contrib/gnunet_identity_gtk_main_window.glade:109
-msgid "Name"
-msgstr "Tên"
-
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:344
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:394
 msgid "<b>Keywords to advertise namespace under:</b>"
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:525
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:566
 #, fuzzy
 msgid "<b>Publishing options</b>"
 msgstr "<b>Ứng dụng đang chạy</b>"
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:549
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:590
 msgid "Execute advertisement."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_advertise_dialog.glade:565
+#: contrib/gnunet_identity_gtk_advertise_dialog.glade:606
 msgid "Closes the dialog without advertising the namespace."
 msgstr ""
 
-#: contrib/gnunet_identity_gtk_main_window.glade:32
-#, fuzzy
-msgid "_File"
-msgstr "Tên tập tin"
-
 #: contrib/gnunet_identity_gtk_main_window.glade:128
 #, fuzzy
 msgid "Unique identifier"
 msgstr "Bộ nhận diện sau"
 
-#: contrib/gnunet_namestore_edit_a.glade:93
-#: contrib/gnunet_namestore_edit_aaaa.glade:76
-#: contrib/gnunet_namestore_edit_cname.glade:76
-#: contrib/gnunet_namestore_edit_gns2dns.glade:598
-#: contrib/gnunet_namestore_edit_leho.glade:93
-#: contrib/gnunet_namestore_edit_mx.glade:98
-#: contrib/gnunet_namestore_edit_phone.glade:99
-#: contrib/gnunet_namestore_edit_pkey.glade:93
-#: contrib/gnunet_namestore_edit_ptr.glade:93
-#: contrib/gnunet_namestore_edit_soa.glade:122
-#: contrib/gnunet_namestore_edit_srv.glade:108
-#: contrib/gnunet_namestore_edit_txt.glade:93
-#: contrib/gnunet_namestore_edit_vpn.glade:93
+#: contrib/gnunet_namestore_edit_aaaa.glade:91
+#: contrib/gnunet_namestore_edit_a.glade:91
+#: contrib/gnunet_namestore_edit_box.glade:154
+#: contrib/gnunet_namestore_edit_cert.glade:91
+#: contrib/gnunet_namestore_edit_cname.glade:73
+#: contrib/gnunet_namestore_edit_gns2dns.glade:591
+#: contrib/gnunet_namestore_edit_leho.glade:91
+#: contrib/gnunet_namestore_edit_mx.glade:96
+#: contrib/gnunet_namestore_edit_phone.glade:97
+#: contrib/gnunet_namestore_edit_pkey.glade:91
+#: contrib/gnunet_namestore_edit_ptr.glade:91
+#: contrib/gnunet_namestore_edit_soa.glade:120
+#: contrib/gnunet_namestore_edit_srv.glade:769
+#: contrib/gnunet_namestore_edit_tlsa.glade:1023
+#: contrib/gnunet_namestore_edit_txt.glade:91
+#: contrib/gnunet_namestore_edit_vpn.glade:91
 msgid ""
 "Store the updated record in the database. If the record is public, GNUnet "
 "will begin to publish the record to the world, limiting your ability to "
 "change it later (based on the selected expiration values)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:130
-#: contrib/gnunet_namestore_edit_aaaa.glade:112
-#: contrib/gnunet_namestore_edit_cname.glade:112
-#: contrib/gnunet_namestore_edit_gns2dns.glade:69
-#: contrib/gnunet_namestore_edit_leho.glade:129
-#: contrib/gnunet_namestore_edit_mx.glade:134
-#: contrib/gnunet_namestore_edit_phone.glade:136
-#: contrib/gnunet_namestore_edit_pkey.glade:129
-#: contrib/gnunet_namestore_edit_ptr.glade:129
-#: contrib/gnunet_namestore_edit_soa.glade:158
-#: contrib/gnunet_namestore_edit_srv.glade:144
-#: contrib/gnunet_namestore_edit_txt.glade:129
-#: contrib/gnunet_namestore_edit_vpn.glade:129
+#: contrib/gnunet_namestore_edit_aaaa.glade:128
+#: contrib/gnunet_namestore_edit_a.glade:128
+#: contrib/gnunet_namestore_edit_box.glade:285
+#: contrib/gnunet_namestore_edit_cert.glade:128
+#: contrib/gnunet_namestore_edit_cname.glade:110
+#: contrib/gnunet_namestore_edit_gns2dns.glade:70
+#: contrib/gnunet_namestore_edit_leho.glade:128
+#: contrib/gnunet_namestore_edit_mx.glade:133
+#: contrib/gnunet_namestore_edit_phone.glade:134
+#: contrib/gnunet_namestore_edit_pkey.glade:128
+#: contrib/gnunet_namestore_edit_ptr.glade:128
+#: contrib/gnunet_namestore_edit_soa.glade:157
+#: contrib/gnunet_namestore_edit_srv.glade:198
+#: contrib/gnunet_namestore_edit_tlsa.glade:214
+#: contrib/gnunet_namestore_edit_txt.glade:128
+#: contrib/gnunet_namestore_edit_vpn.glade:128
 msgid "Name of the record in the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:148
-#: contrib/gnunet_namestore_edit_aaaa.glade:130
-#: contrib/gnunet_namestore_edit_cname.glade:130
-#: contrib/gnunet_namestore_edit_gns2dns.glade:87
-#: contrib/gnunet_namestore_edit_leho.glade:147
-#: contrib/gnunet_namestore_edit_mx.glade:152
-#: contrib/gnunet_namestore_edit_phone.glade:154
-#: contrib/gnunet_namestore_edit_pkey.glade:147
-#: contrib/gnunet_namestore_edit_ptr.glade:147
-#: contrib/gnunet_namestore_edit_soa.glade:176
-#: contrib/gnunet_namestore_edit_srv.glade:162
-#: contrib/gnunet_namestore_edit_txt.glade:147
-#: contrib/gnunet_namestore_edit_vpn.glade:147
+#: contrib/gnunet_namestore_edit_aaaa.glade:144
+#: contrib/gnunet_namestore_edit_a.glade:144
+#: contrib/gnunet_namestore_edit_box.glade:301
+#: contrib/gnunet_namestore_edit_cert.glade:144
+#: contrib/gnunet_namestore_edit_cname.glade:128
+#: contrib/gnunet_namestore_edit_gns2dns.glade:86
+#: contrib/gnunet_namestore_edit_leho.glade:144
+#: contrib/gnunet_namestore_edit_mx.glade:149
+#: contrib/gnunet_namestore_edit_phone.glade:150
+#: contrib/gnunet_namestore_edit_pkey.glade:144
+#: contrib/gnunet_namestore_edit_ptr.glade:144
+#: contrib/gnunet_namestore_edit_soa.glade:173
+#: contrib/gnunet_namestore_edit_srv.glade:214
+#: contrib/gnunet_namestore_edit_tlsa.glade:230
+#: contrib/gnunet_namestore_edit_txt.glade:144
+#: contrib/gnunet_namestore_edit_vpn.glade:144
 msgid "in"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:161
-#: contrib/gnunet_namestore_edit_aaaa.glade:143
-#: contrib/gnunet_namestore_edit_cname.glade:143
-#: contrib/gnunet_namestore_edit_gns2dns.glade:100
-#: contrib/gnunet_namestore_edit_leho.glade:160
-#: contrib/gnunet_namestore_edit_mx.glade:165
-#: contrib/gnunet_namestore_edit_phone.glade:167
-#: contrib/gnunet_namestore_edit_pkey.glade:160
-#: contrib/gnunet_namestore_edit_ptr.glade:160
-#: contrib/gnunet_namestore_edit_soa.glade:189
-#: contrib/gnunet_namestore_edit_srv.glade:175
-#: contrib/gnunet_namestore_edit_txt.glade:160
-#: contrib/gnunet_namestore_edit_vpn.glade:160
+#: contrib/gnunet_namestore_edit_aaaa.glade:157
+#: contrib/gnunet_namestore_edit_a.glade:157
+#: contrib/gnunet_namestore_edit_box.glade:314
+#: contrib/gnunet_namestore_edit_cert.glade:157
+#: contrib/gnunet_namestore_edit_cname.glade:141
+#: contrib/gnunet_namestore_edit_gns2dns.glade:99
+#: contrib/gnunet_namestore_edit_leho.glade:157
+#: contrib/gnunet_namestore_edit_mx.glade:162
+#: contrib/gnunet_namestore_edit_phone.glade:163
+#: contrib/gnunet_namestore_edit_pkey.glade:157
+#: contrib/gnunet_namestore_edit_ptr.glade:157
+#: contrib/gnunet_namestore_edit_soa.glade:186
+#: contrib/gnunet_namestore_edit_srv.glade:227
+#: contrib/gnunet_namestore_edit_tlsa.glade:243
+#: contrib/gnunet_namestore_edit_txt.glade:157
+#: contrib/gnunet_namestore_edit_vpn.glade:157
 msgid ""
 "Select the desired zone for the record.  Changing this value here will move "
 "the record to the selected zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:185
-#: contrib/gnunet_namestore_edit_aaaa.glade:167
-#: contrib/gnunet_namestore_edit_cname.glade:167
-#: contrib/gnunet_namestore_edit_gns2dns.glade:124
-#: contrib/gnunet_namestore_edit_leho.glade:184
-#: contrib/gnunet_namestore_edit_mx.glade:189
-#: contrib/gnunet_namestore_edit_phone.glade:191
-#: contrib/gnunet_namestore_edit_pkey.glade:184
-#: contrib/gnunet_namestore_edit_ptr.glade:184
-#: contrib/gnunet_namestore_edit_soa.glade:213
-#: contrib/gnunet_namestore_edit_srv.glade:199
-#: contrib/gnunet_namestore_edit_txt.glade:184
-#: contrib/gnunet_namestore_edit_vpn.glade:184
+#: contrib/gnunet_namestore_edit_aaaa.glade:181
+#: contrib/gnunet_namestore_edit_a.glade:181
+#: contrib/gnunet_namestore_edit_box.glade:338
+#: contrib/gnunet_namestore_edit_cert.glade:181
+#: contrib/gnunet_namestore_edit_cname.glade:165
+#: contrib/gnunet_namestore_edit_gns2dns.glade:123
+#: contrib/gnunet_namestore_edit_leho.glade:181
+#: contrib/gnunet_namestore_edit_mx.glade:186
+#: contrib/gnunet_namestore_edit_phone.glade:187
+#: contrib/gnunet_namestore_edit_pkey.glade:181
+#: contrib/gnunet_namestore_edit_ptr.glade:181
+#: contrib/gnunet_namestore_edit_soa.glade:210
+#: contrib/gnunet_namestore_edit_srv.glade:251
+#: contrib/gnunet_namestore_edit_tlsa.glade:267
+#: contrib/gnunet_namestore_edit_txt.glade:181
+#: contrib/gnunet_namestore_edit_vpn.glade:181
 #, fuzzy
 msgid "<b>Name</b>"
 msgstr "<b>Siêu dữ liệu</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:217
-#: contrib/gnunet_namestore_edit_ptr.glade:216
-#: contrib/gnunet_namestore_edit_txt.glade:216
+#: contrib/gnunet_namestore_edit_aaaa.glade:213
 msgid ""
-"Enter the IPv4 address for the A record here. The format is the usual dotted-"
-"decimal format (i.e. 127.0.0.1)."
+"Enter the IPv6 address for the A record here. The format is the usual format "
+"(i.e. ::1)."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:240
-msgid "<b>Destination IPv4 Address</b>"
+#: contrib/gnunet_namestore_edit_aaaa.glade:234
+msgid "<b>Destination IPv6 Address</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:269
-#: contrib/gnunet_namestore_edit_aaaa.glade:251
-#: contrib/gnunet_namestore_edit_cname.glade:251
-#: contrib/gnunet_namestore_edit_gns2dns.glade:267
-#: contrib/gnunet_namestore_edit_leho.glade:268
-#: contrib/gnunet_namestore_edit_mx.glade:304
-#: contrib/gnunet_namestore_edit_phone.glade:320
-#: contrib/gnunet_namestore_edit_pkey.glade:268
-#: contrib/gnunet_namestore_edit_ptr.glade:268
-#: contrib/gnunet_namestore_edit_soa.glade:505
-#: contrib/gnunet_namestore_edit_srv.glade:392
-#: contrib/gnunet_namestore_edit_txt.glade:268
-#: contrib/gnunet_namestore_edit_vpn.glade:370
+#: contrib/gnunet_namestore_edit_aaaa.glade:263
+#: contrib/gnunet_namestore_edit_a.glade:263
+#: contrib/gnunet_namestore_edit_box.glade:905
+#: contrib/gnunet_namestore_edit_cert.glade:407
+#: contrib/gnunet_namestore_edit_cname.glade:249
+#: contrib/gnunet_namestore_edit_gns2dns.glade:261
+#: contrib/gnunet_namestore_edit_leho.glade:263
+#: contrib/gnunet_namestore_edit_mx.glade:297
+#: contrib/gnunet_namestore_edit_phone.glade:312
+#: contrib/gnunet_namestore_edit_pkey.glade:263
+#: contrib/gnunet_namestore_edit_ptr.glade:263
+#: contrib/gnunet_namestore_edit_soa.glade:488
+#: contrib/gnunet_namestore_edit_srv.glade:427
+#: contrib/gnunet_namestore_edit_tlsa.glade:681
+#: contrib/gnunet_namestore_edit_txt.glade:262
+#: contrib/gnunet_namestore_edit_vpn.glade:363
 msgid "Record is public (visible to other users)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:274
-#: contrib/gnunet_namestore_edit_aaaa.glade:256
-#: contrib/gnunet_namestore_edit_cname.glade:256
-#: contrib/gnunet_namestore_edit_gns2dns.glade:271
-#: contrib/gnunet_namestore_edit_leho.glade:273
-#: contrib/gnunet_namestore_edit_mx.glade:309
-#: contrib/gnunet_namestore_edit_phone.glade:325
-#: contrib/gnunet_namestore_edit_pkey.glade:273
-#: contrib/gnunet_namestore_edit_ptr.glade:273
-#: contrib/gnunet_namestore_edit_soa.glade:510
-#: contrib/gnunet_namestore_edit_srv.glade:397
-#: contrib/gnunet_namestore_edit_txt.glade:273
-#: contrib/gnunet_namestore_edit_vpn.glade:375
-msgid ""
-"Not that while it is recommended that 'private' records should be in the "
-"'private zone', you are allowed to mark records in other zones as private as "
-"well.  Please be aware that once a record is made public, you are less free "
-"to change expiration times.  Most importantly, if your record is set to "
-"never expire, you will never be able to change the mapping in the future if "
-"the record is public."
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_a.glade:285
 #: contrib/gnunet_namestore_edit_aaaa.glade:267
-#: contrib/gnunet_namestore_edit_cname.glade:267
-#: contrib/gnunet_namestore_edit_gns2dns.glade:282
-#: contrib/gnunet_namestore_edit_leho.glade:284
-#: contrib/gnunet_namestore_edit_mx.glade:320
-#: contrib/gnunet_namestore_edit_phone.glade:336
-#: contrib/gnunet_namestore_edit_pkey.glade:284
-#: contrib/gnunet_namestore_edit_ptr.glade:284
-#: contrib/gnunet_namestore_edit_soa.glade:521
-#: contrib/gnunet_namestore_edit_srv.glade:408
-#: contrib/gnunet_namestore_edit_txt.glade:284
-#: contrib/gnunet_namestore_edit_vpn.glade:386
+#: contrib/gnunet_namestore_edit_a.glade:267
+#: contrib/gnunet_namestore_edit_box.glade:909
+#: contrib/gnunet_namestore_edit_cert.glade:411
+#: contrib/gnunet_namestore_edit_cname.glade:253
+#: contrib/gnunet_namestore_edit_gns2dns.glade:265
+#: contrib/gnunet_namestore_edit_leho.glade:267
+#: contrib/gnunet_namestore_edit_mx.glade:301
+#: contrib/gnunet_namestore_edit_phone.glade:316
+#: contrib/gnunet_namestore_edit_pkey.glade:267
+#: contrib/gnunet_namestore_edit_ptr.glade:267
+#: contrib/gnunet_namestore_edit_soa.glade:492
+#: contrib/gnunet_namestore_edit_srv.glade:431
+#: contrib/gnunet_namestore_edit_tlsa.glade:685
+#: contrib/gnunet_namestore_edit_txt.glade:266
+#: contrib/gnunet_namestore_edit_vpn.glade:367
+msgid ""
+"Please be aware that once a record is made public, you are less free to "
+"change expiration times.  Most importantly, if your record is set to never "
+"expire, you will never be able to change the mapping in the future if the "
+"record is public."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:279
+#: contrib/gnunet_namestore_edit_a.glade:279
+#: contrib/gnunet_namestore_edit_box.glade:921
+#: contrib/gnunet_namestore_edit_cert.glade:423
+#: contrib/gnunet_namestore_edit_cname.glade:264
+#: contrib/gnunet_namestore_edit_gns2dns.glade:277
+#: contrib/gnunet_namestore_edit_leho.glade:279
+#: contrib/gnunet_namestore_edit_mx.glade:313
+#: contrib/gnunet_namestore_edit_phone.glade:328
+#: contrib/gnunet_namestore_edit_pkey.glade:279
+#: contrib/gnunet_namestore_edit_ptr.glade:279
+#: contrib/gnunet_namestore_edit_soa.glade:504
+#: contrib/gnunet_namestore_edit_srv.glade:443
+#: contrib/gnunet_namestore_edit_tlsa.glade:697
+#: contrib/gnunet_namestore_edit_txt.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:379
 msgid "Record is a shadow record (valid after other records expire)"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:290
-#: contrib/gnunet_namestore_edit_aaaa.glade:272
-#: contrib/gnunet_namestore_edit_cname.glade:272
-#: contrib/gnunet_namestore_edit_gns2dns.glade:286
-#: contrib/gnunet_namestore_edit_leho.glade:289
-#: contrib/gnunet_namestore_edit_mx.glade:325
-#: contrib/gnunet_namestore_edit_phone.glade:341
-#: contrib/gnunet_namestore_edit_pkey.glade:289
-#: contrib/gnunet_namestore_edit_ptr.glade:289
-#: contrib/gnunet_namestore_edit_soa.glade:526
-#: contrib/gnunet_namestore_edit_srv.glade:413
-#: contrib/gnunet_namestore_edit_txt.glade:289
-#: contrib/gnunet_namestore_edit_vpn.glade:391
+#: contrib/gnunet_namestore_edit_aaaa.glade:283
+#: contrib/gnunet_namestore_edit_a.glade:283
+#: contrib/gnunet_namestore_edit_box.glade:925
+#: contrib/gnunet_namestore_edit_cert.glade:427
+#: contrib/gnunet_namestore_edit_cname.glade:268
+#: contrib/gnunet_namestore_edit_gns2dns.glade:281
+#: contrib/gnunet_namestore_edit_leho.glade:283
+#: contrib/gnunet_namestore_edit_mx.glade:317
+#: contrib/gnunet_namestore_edit_phone.glade:332
+#: contrib/gnunet_namestore_edit_pkey.glade:283
+#: contrib/gnunet_namestore_edit_ptr.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:508
+#: contrib/gnunet_namestore_edit_srv.glade:447
+#: contrib/gnunet_namestore_edit_tlsa.glade:701
+#: contrib/gnunet_namestore_edit_txt.glade:282
+#: contrib/gnunet_namestore_edit_vpn.glade:383
 msgid ""
 "A shadow record is a record which becomes valid in the future.  They are not "
 "used as long as a second non-expired record with the same name and type "
@@ -1978,52 +2461,61 @@ msgid ""
 "becomes valid at midnight."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:307
-#: contrib/gnunet_namestore_edit_aaaa.glade:289
-#: contrib/gnunet_namestore_edit_cname.glade:289
-#: contrib/gnunet_namestore_edit_gns2dns.glade:303
-#: contrib/gnunet_namestore_edit_leho.glade:306
-#: contrib/gnunet_namestore_edit_mx.glade:342
-#: contrib/gnunet_namestore_edit_phone.glade:358
-#: contrib/gnunet_namestore_edit_pkey.glade:306
-#: contrib/gnunet_namestore_edit_ptr.glade:306
-#: contrib/gnunet_namestore_edit_soa.glade:543
-#: contrib/gnunet_namestore_edit_srv.glade:430
-#: contrib/gnunet_namestore_edit_txt.glade:306
-#: contrib/gnunet_namestore_edit_vpn.glade:408
+#: contrib/gnunet_namestore_edit_aaaa.glade:301
+#: contrib/gnunet_namestore_edit_a.glade:301
+#: contrib/gnunet_namestore_edit_box.glade:943
+#: contrib/gnunet_namestore_edit_cert.glade:445
+#: contrib/gnunet_namestore_edit_cname.glade:285
+#: contrib/gnunet_namestore_edit_gns2dns.glade:299
+#: contrib/gnunet_namestore_edit_leho.glade:301
+#: contrib/gnunet_namestore_edit_mx.glade:335
+#: contrib/gnunet_namestore_edit_phone.glade:350
+#: contrib/gnunet_namestore_edit_pkey.glade:301
+#: contrib/gnunet_namestore_edit_ptr.glade:301
+#: contrib/gnunet_namestore_edit_soa.glade:526
+#: contrib/gnunet_namestore_edit_srv.glade:465
+#: contrib/gnunet_namestore_edit_tlsa.glade:719
+#: contrib/gnunet_namestore_edit_txt.glade:300
+#: contrib/gnunet_namestore_edit_vpn.glade:401
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "<b>Ứng dụng đang chạy</b>"
 
-#: contrib/gnunet_namestore_edit_a.glade:342
-#: contrib/gnunet_namestore_edit_aaaa.glade:324
-#: contrib/gnunet_namestore_edit_cname.glade:324
-#: contrib/gnunet_namestore_edit_gns2dns.glade:338
-#: contrib/gnunet_namestore_edit_leho.glade:341
-#: contrib/gnunet_namestore_edit_mx.glade:377
-#: contrib/gnunet_namestore_edit_phone.glade:393
-#: contrib/gnunet_namestore_edit_pkey.glade:341
-#: contrib/gnunet_namestore_edit_ptr.glade:341
-#: contrib/gnunet_namestore_edit_soa.glade:578
-#: contrib/gnunet_namestore_edit_srv.glade:465
-#: contrib/gnunet_namestore_edit_txt.glade:341
-#: contrib/gnunet_namestore_edit_vpn.glade:443
+#: contrib/gnunet_namestore_edit_aaaa.glade:336
+#: contrib/gnunet_namestore_edit_a.glade:336
+#: contrib/gnunet_namestore_edit_box.glade:978
+#: contrib/gnunet_namestore_edit_cert.glade:480
+#: contrib/gnunet_namestore_edit_cname.glade:320
+#: contrib/gnunet_namestore_edit_gns2dns.glade:334
+#: contrib/gnunet_namestore_edit_leho.glade:336
+#: contrib/gnunet_namestore_edit_mx.glade:370
+#: contrib/gnunet_namestore_edit_phone.glade:385
+#: contrib/gnunet_namestore_edit_pkey.glade:336
+#: contrib/gnunet_namestore_edit_ptr.glade:336
+#: contrib/gnunet_namestore_edit_soa.glade:561
+#: contrib/gnunet_namestore_edit_srv.glade:500
+#: contrib/gnunet_namestore_edit_tlsa.glade:754
+#: contrib/gnunet_namestore_edit_txt.glade:335
+#: contrib/gnunet_namestore_edit_vpn.glade:436
 msgid "Relative"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:347
-#: contrib/gnunet_namestore_edit_aaaa.glade:329
-#: contrib/gnunet_namestore_edit_cname.glade:329
-#: contrib/gnunet_namestore_edit_gns2dns.glade:342
-#: contrib/gnunet_namestore_edit_leho.glade:346
-#: contrib/gnunet_namestore_edit_mx.glade:382
-#: contrib/gnunet_namestore_edit_phone.glade:398
-#: contrib/gnunet_namestore_edit_pkey.glade:346
-#: contrib/gnunet_namestore_edit_ptr.glade:346
-#: contrib/gnunet_namestore_edit_soa.glade:583
-#: contrib/gnunet_namestore_edit_srv.glade:470
-#: contrib/gnunet_namestore_edit_txt.glade:346
-#: contrib/gnunet_namestore_edit_vpn.glade:448
+#: contrib/gnunet_namestore_edit_aaaa.glade:340
+#: contrib/gnunet_namestore_edit_a.glade:340
+#: contrib/gnunet_namestore_edit_box.glade:982
+#: contrib/gnunet_namestore_edit_cert.glade:484
+#: contrib/gnunet_namestore_edit_cname.glade:324
+#: contrib/gnunet_namestore_edit_gns2dns.glade:338
+#: contrib/gnunet_namestore_edit_leho.glade:340
+#: contrib/gnunet_namestore_edit_mx.glade:374
+#: contrib/gnunet_namestore_edit_phone.glade:389
+#: contrib/gnunet_namestore_edit_pkey.glade:340
+#: contrib/gnunet_namestore_edit_ptr.glade:340
+#: contrib/gnunet_namestore_edit_soa.glade:565
+#: contrib/gnunet_namestore_edit_srv.glade:504
+#: contrib/gnunet_namestore_edit_tlsa.glade:758
+#: contrib/gnunet_namestore_edit_txt.glade:339
+#: contrib/gnunet_namestore_edit_vpn.glade:440
 msgid ""
 "Records with a relative expiration time (such as 1 week) are always valid "
 "for at least that time period into the future. In other words, the auto-"
@@ -2034,265 +2526,505 @@ msgid ""
 "entries for which you do not know a specific date when they will expire."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:360
-#: contrib/gnunet_namestore_edit_aaaa.glade:342
-#: contrib/gnunet_namestore_edit_cname.glade:342
-#: contrib/gnunet_namestore_edit_gns2dns.glade:355
-#: contrib/gnunet_namestore_edit_leho.glade:359
-#: contrib/gnunet_namestore_edit_mx.glade:395
-#: contrib/gnunet_namestore_edit_phone.glade:411
-#: contrib/gnunet_namestore_edit_pkey.glade:359
-#: contrib/gnunet_namestore_edit_ptr.glade:359
-#: contrib/gnunet_namestore_edit_soa.glade:596
-#: contrib/gnunet_namestore_edit_srv.glade:483
-#: contrib/gnunet_namestore_edit_txt.glade:359
-#: contrib/gnunet_namestore_edit_vpn.glade:461
-msgid "Absolute"
+#: contrib/gnunet_namestore_edit_aaaa.glade:354
+#: contrib/gnunet_namestore_edit_a.glade:354
+#: contrib/gnunet_namestore_edit_box.glade:996
+#: contrib/gnunet_namestore_edit_cert.glade:498
+#: contrib/gnunet_namestore_edit_cname.glade:337
+#: contrib/gnunet_namestore_edit_gns2dns.glade:352
+#: contrib/gnunet_namestore_edit_leho.glade:354
+#: contrib/gnunet_namestore_edit_mx.glade:388
+#: contrib/gnunet_namestore_edit_phone.glade:403
+#: contrib/gnunet_namestore_edit_pkey.glade:354
+#: contrib/gnunet_namestore_edit_ptr.glade:354
+#: contrib/gnunet_namestore_edit_soa.glade:579
+#: contrib/gnunet_namestore_edit_srv.glade:518
+#: contrib/gnunet_namestore_edit_tlsa.glade:772
+#: contrib/gnunet_namestore_edit_txt.glade:353
+#: contrib/gnunet_namestore_edit_vpn.glade:454
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:358
+#: contrib/gnunet_namestore_edit_a.glade:358
+#: contrib/gnunet_namestore_edit_box.glade:1000
+#: contrib/gnunet_namestore_edit_cert.glade:502
+#: contrib/gnunet_namestore_edit_cname.glade:341
+#: contrib/gnunet_namestore_edit_gns2dns.glade:356
+#: contrib/gnunet_namestore_edit_leho.glade:358
+#: contrib/gnunet_namestore_edit_mx.glade:392
+#: contrib/gnunet_namestore_edit_phone.glade:407
+#: contrib/gnunet_namestore_edit_pkey.glade:358
+#: contrib/gnunet_namestore_edit_ptr.glade:358
+#: contrib/gnunet_namestore_edit_soa.glade:583
+#: contrib/gnunet_namestore_edit_srv.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:776
+#: contrib/gnunet_namestore_edit_txt.glade:357
+#: contrib/gnunet_namestore_edit_vpn.glade:458
+msgid ""
+"Records with an absolute expiration time are valid until the specified date. "
+"You can change that date to an even later date, but you cannot set it to an "
+"earlier time (as other users may have cached the longer expiration time). "
+"Use absolute expiration times if you know that a particular record will only "
+"be valid until a particular day."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:373
+#: contrib/gnunet_namestore_edit_a.glade:373
+#: contrib/gnunet_namestore_edit_box.glade:1014
+#: contrib/gnunet_namestore_edit_cert.glade:517
+#: contrib/gnunet_namestore_edit_cname.glade:355
+#: contrib/gnunet_namestore_edit_gns2dns.glade:371
+#: contrib/gnunet_namestore_edit_leho.glade:373
+#: contrib/gnunet_namestore_edit_mx.glade:407
+#: contrib/gnunet_namestore_edit_phone.glade:422
+#: contrib/gnunet_namestore_edit_pkey.glade:373
+#: contrib/gnunet_namestore_edit_ptr.glade:373
+#: contrib/gnunet_namestore_edit_soa.glade:598
+#: contrib/gnunet_namestore_edit_srv.glade:536
+#: contrib/gnunet_namestore_edit_tlsa.glade:790
+#: contrib/gnunet_namestore_edit_txt.glade:372
+#: contrib/gnunet_namestore_edit_vpn.glade:473
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:377
+#: contrib/gnunet_namestore_edit_a.glade:377
+#: contrib/gnunet_namestore_edit_box.glade:1018
+#: contrib/gnunet_namestore_edit_cert.glade:521
+#: contrib/gnunet_namestore_edit_cname.glade:359
+#: contrib/gnunet_namestore_edit_gns2dns.glade:375
+#: contrib/gnunet_namestore_edit_leho.glade:377
+#: contrib/gnunet_namestore_edit_mx.glade:411
+#: contrib/gnunet_namestore_edit_phone.glade:426
+#: contrib/gnunet_namestore_edit_pkey.glade:377
+#: contrib/gnunet_namestore_edit_ptr.glade:377
+#: contrib/gnunet_namestore_edit_soa.glade:602
+#: contrib/gnunet_namestore_edit_srv.glade:540
+#: contrib/gnunet_namestore_edit_tlsa.glade:794
+#: contrib/gnunet_namestore_edit_txt.glade:376
+#: contrib/gnunet_namestore_edit_vpn.glade:477
+msgid ""
+"Records can be set to be valid forever. This is great if you are worried "
+"about censorship or certain that the mapping will never change.  Note that "
+"if you set a public record to never expire, you cannot later change it (as "
+"other users are free to cache the old value forever)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:400
+#: contrib/gnunet_namestore_edit_a.glade:400
+#: contrib/gnunet_namestore_edit_box.glade:1040
+#: contrib/gnunet_namestore_edit_cert.glade:544
+#: contrib/gnunet_namestore_edit_cname.glade:381
+#: contrib/gnunet_namestore_edit_gns2dns.glade:398
+#: contrib/gnunet_namestore_edit_leho.glade:400
+#: contrib/gnunet_namestore_edit_mx.glade:434
+#: contrib/gnunet_namestore_edit_phone.glade:449
+#: contrib/gnunet_namestore_edit_pkey.glade:400
+#: contrib/gnunet_namestore_edit_ptr.glade:400
+#: contrib/gnunet_namestore_edit_soa.glade:625
+#: contrib/gnunet_namestore_edit_srv.glade:562
+#: contrib/gnunet_namestore_edit_tlsa.glade:816
+#: contrib/gnunet_namestore_edit_txt.glade:399
+#: contrib/gnunet_namestore_edit_vpn.glade:500
+msgid ""
+"Select the date on which you want this record to expire. At that date, you "
+"can then create a new mapping or have a shadow record go automatically into "
+"effect.  Note that for public records you cannot change the expiration time "
+"to an earlier date after the fact."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:420
+#: contrib/gnunet_namestore_edit_a.glade:420
+#: contrib/gnunet_namestore_edit_box.glade:1060
+#: contrib/gnunet_namestore_edit_cert.glade:564
+#: contrib/gnunet_namestore_edit_cname.glade:401
+#: contrib/gnunet_namestore_edit_gns2dns.glade:418
+#: contrib/gnunet_namestore_edit_leho.glade:420
+#: contrib/gnunet_namestore_edit_mx.glade:454
+#: contrib/gnunet_namestore_edit_phone.glade:469
+#: contrib/gnunet_namestore_edit_pkey.glade:420
+#: contrib/gnunet_namestore_edit_ptr.glade:420
+#: contrib/gnunet_namestore_edit_soa.glade:645
+#: contrib/gnunet_namestore_edit_srv.glade:582
+#: contrib/gnunet_namestore_edit_tlsa.glade:836
+#: contrib/gnunet_namestore_edit_txt.glade:419
+#: contrib/gnunet_namestore_edit_vpn.glade:520
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:433
+#: contrib/gnunet_namestore_edit_a.glade:433
+#: contrib/gnunet_namestore_edit_box.glade:1073
+#: contrib/gnunet_namestore_edit_cert.glade:577
+#: contrib/gnunet_namestore_edit_cname.glade:414
+#: contrib/gnunet_namestore_edit_gns2dns.glade:431
+#: contrib/gnunet_namestore_edit_leho.glade:433
+#: contrib/gnunet_namestore_edit_mx.glade:467
+#: contrib/gnunet_namestore_edit_phone.glade:482
+#: contrib/gnunet_namestore_edit_pkey.glade:433
+#: contrib/gnunet_namestore_edit_ptr.glade:433
+#: contrib/gnunet_namestore_edit_soa.glade:658
+#: contrib/gnunet_namestore_edit_srv.glade:595
+#: contrib/gnunet_namestore_edit_tlsa.glade:849
+#: contrib/gnunet_namestore_edit_txt.glade:432
+#: contrib/gnunet_namestore_edit_vpn.glade:533
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:450
+#: contrib/gnunet_namestore_edit_a.glade:450
+#: contrib/gnunet_namestore_edit_box.glade:1091
+#: contrib/gnunet_namestore_edit_cert.glade:594
+#: contrib/gnunet_namestore_edit_cname.glade:433
+#: contrib/gnunet_namestore_edit_gns2dns.glade:448
+#: contrib/gnunet_namestore_edit_leho.glade:450
+#: contrib/gnunet_namestore_edit_mx.glade:484
+#: contrib/gnunet_namestore_edit_phone.glade:499
+#: contrib/gnunet_namestore_edit_pkey.glade:450
+#: contrib/gnunet_namestore_edit_ptr.glade:450
+#: contrib/gnunet_namestore_edit_soa.glade:675
+#: contrib/gnunet_namestore_edit_srv.glade:613
+#: contrib/gnunet_namestore_edit_tlsa.glade:867
+#: contrib/gnunet_namestore_edit_txt.glade:449
+#: contrib/gnunet_namestore_edit_vpn.glade:550
+#, fuzzy
+msgid "Minutes:"
+msgstr "phút"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:463
+#: contrib/gnunet_namestore_edit_a.glade:463
+#: contrib/gnunet_namestore_edit_box.glade:1104
+#: contrib/gnunet_namestore_edit_cert.glade:607
+#: contrib/gnunet_namestore_edit_cname.glade:446
+#: contrib/gnunet_namestore_edit_gns2dns.glade:461
+#: contrib/gnunet_namestore_edit_leho.glade:463
+#: contrib/gnunet_namestore_edit_mx.glade:497
+#: contrib/gnunet_namestore_edit_phone.glade:512
+#: contrib/gnunet_namestore_edit_pkey.glade:463
+#: contrib/gnunet_namestore_edit_ptr.glade:463
+#: contrib/gnunet_namestore_edit_soa.glade:688
+#: contrib/gnunet_namestore_edit_srv.glade:626
+#: contrib/gnunet_namestore_edit_tlsa.glade:880
+#: contrib/gnunet_namestore_edit_txt.glade:462
+#: contrib/gnunet_namestore_edit_vpn.glade:563
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:480
+#: contrib/gnunet_namestore_edit_a.glade:480
+#: contrib/gnunet_namestore_edit_box.glade:1122
+#: contrib/gnunet_namestore_edit_cert.glade:624
+#: contrib/gnunet_namestore_edit_cname.glade:465
+#: contrib/gnunet_namestore_edit_gns2dns.glade:478
+#: contrib/gnunet_namestore_edit_leho.glade:480
+#: contrib/gnunet_namestore_edit_mx.glade:514
+#: contrib/gnunet_namestore_edit_phone.glade:529
+#: contrib/gnunet_namestore_edit_pkey.glade:480
+#: contrib/gnunet_namestore_edit_ptr.glade:480
+#: contrib/gnunet_namestore_edit_soa.glade:705
+#: contrib/gnunet_namestore_edit_srv.glade:644
+#: contrib/gnunet_namestore_edit_tlsa.glade:898
+#: contrib/gnunet_namestore_edit_txt.glade:479
+#: contrib/gnunet_namestore_edit_vpn.glade:580
+#, fuzzy
+msgid "Seconds:"
+msgstr "giây"
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:493
+#: contrib/gnunet_namestore_edit_a.glade:493
+#: contrib/gnunet_namestore_edit_box.glade:1135
+#: contrib/gnunet_namestore_edit_cert.glade:637
+#: contrib/gnunet_namestore_edit_cname.glade:478
+#: contrib/gnunet_namestore_edit_gns2dns.glade:491
+#: contrib/gnunet_namestore_edit_leho.glade:493
+#: contrib/gnunet_namestore_edit_mx.glade:527
+#: contrib/gnunet_namestore_edit_phone.glade:542
+#: contrib/gnunet_namestore_edit_pkey.glade:493
+#: contrib/gnunet_namestore_edit_ptr.glade:493
+#: contrib/gnunet_namestore_edit_soa.glade:718
+#: contrib/gnunet_namestore_edit_srv.glade:657
+#: contrib/gnunet_namestore_edit_tlsa.glade:911
+#: contrib/gnunet_namestore_edit_txt.glade:492
+#: contrib/gnunet_namestore_edit_vpn.glade:593
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:517
+#: contrib/gnunet_namestore_edit_a.glade:517
+#: contrib/gnunet_namestore_edit_box.glade:1160
+#: contrib/gnunet_namestore_edit_cert.glade:661
+#: contrib/gnunet_namestore_edit_cname.glade:504
+#: contrib/gnunet_namestore_edit_gns2dns.glade:515
+#: contrib/gnunet_namestore_edit_leho.glade:517
+#: contrib/gnunet_namestore_edit_mx.glade:551
+#: contrib/gnunet_namestore_edit_phone.glade:566
+#: contrib/gnunet_namestore_edit_pkey.glade:517
+#: contrib/gnunet_namestore_edit_ptr.glade:517
+#: contrib/gnunet_namestore_edit_soa.glade:742
+#: contrib/gnunet_namestore_edit_srv.glade:682
+#: contrib/gnunet_namestore_edit_tlsa.glade:936
+#: contrib/gnunet_namestore_edit_txt.glade:516
+#: contrib/gnunet_namestore_edit_vpn.glade:617
+msgid ""
+"Relative expiration time of the record.  The syntax is a number followed by "
+"a space and a time unit, possibly followed by additional numbers and time "
+"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
+"drop-down menu to select from a set of common defaults. (Editing is not "
+"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_aaaa.glade:541
+#: contrib/gnunet_namestore_edit_a.glade:541
+#: contrib/gnunet_namestore_edit_box.glade:1184
+#: contrib/gnunet_namestore_edit_cert.glade:685
+#: contrib/gnunet_namestore_edit_cname.glade:528
+#: contrib/gnunet_namestore_edit_gns2dns.glade:539
+#: contrib/gnunet_namestore_edit_leho.glade:541
+#: contrib/gnunet_namestore_edit_mx.glade:575
+#: contrib/gnunet_namestore_edit_phone.glade:590
+#: contrib/gnunet_namestore_edit_pkey.glade:541
+#: contrib/gnunet_namestore_edit_ptr.glade:541
+#: contrib/gnunet_namestore_edit_soa.glade:766
+#: contrib/gnunet_namestore_edit_srv.glade:706
+#: contrib/gnunet_namestore_edit_tlsa.glade:960
+#: contrib/gnunet_namestore_edit_txt.glade:540
+#: contrib/gnunet_namestore_edit_vpn.glade:641
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Bài xuất bản</b>"
+
+#: contrib/gnunet_namestore_edit_a.glade:213
+#: contrib/gnunet_namestore_edit_ptr.glade:213
+#: contrib/gnunet_namestore_edit_txt.glade:213
+msgid ""
+"Enter the IPv4 address for the A record here. The format is the usual dotted-"
+"decimal format (i.e. 127.0.0.1)."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_a.glade:234
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:46
+#: contrib/gnunet_namestore_edit_srv.glade:46
+#: contrib/gnunet_namestore_edit_tlsa.glade:46
+msgid "tcp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:50
+#: contrib/gnunet_namestore_edit_srv.glade:50
+#: contrib/gnunet_namestore_edit_tlsa.glade:50
+msgid "udp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:54
+#: contrib/gnunet_namestore_edit_srv.glade:54
+#: contrib/gnunet_namestore_edit_tlsa.glade:54
+msgid "sctp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:58
+#: contrib/gnunet_namestore_edit_srv.glade:58
+#: contrib/gnunet_namestore_edit_tlsa.glade:58
+msgid "dccp"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:204
+#: contrib/gnunet_namestore_edit_srv.glade:116
+#: contrib/gnunet_namestore_edit_tlsa.glade:131
+msgid "_Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:221
+#: contrib/gnunet_namestore_edit_srv.glade:133
+msgid "80"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:238
+#: contrib/gnunet_namestore_edit_srv.glade:150
+#: contrib/gnunet_namestore_edit_tlsa.glade:165
+#: contrib/gnunet_namestore_edit_vpn.glade:214
+msgid "Protocol:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:385
+#: contrib/gnunet_namestore_edit_srv.glade:295
+msgid "Weight:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:396
+#: contrib/gnunet_namestore_edit_srv.glade:306
+#: contrib/gnunet_setup_main_window.glade:780
+#: contrib/gnunet_setup_main_window.glade:3437
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:418
+#: contrib/gnunet_namestore_edit_srv.glade:328
+msgid "Priority of the target, lower values means more preferred"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:435
+#: contrib/gnunet_namestore_edit_srv.glade:345
+msgid "Relative weight for records with the same priority"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:452
+#: contrib/gnunet_namestore_edit_srv.glade:362
+msgid "TCP or UDP port on which the service is to be found"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:469
+#: contrib/gnunet_namestore_edit_srv.glade:379
+msgid "Canonical hostname of the machine providing the service"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:487
+#: contrib/gnunet_namestore_edit_srv.glade:398
+#, fuzzy
+msgid "<b>Service record (SRV)</b>"
+msgstr "<b>Cấu hình Trình nền GNUnet</b>"
+
+#: contrib/gnunet_namestore_edit_box.glade:522
+#: contrib/gnunet_namestore_edit_tlsa.glade:302
+msgid "Usage:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:533
+#: contrib/gnunet_namestore_edit_tlsa.glade:313
+msgid "CA Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:365
-#: contrib/gnunet_namestore_edit_aaaa.glade:347
-#: contrib/gnunet_namestore_edit_cname.glade:347
-#: contrib/gnunet_namestore_edit_gns2dns.glade:359
-#: contrib/gnunet_namestore_edit_leho.glade:364
-#: contrib/gnunet_namestore_edit_mx.glade:400
-#: contrib/gnunet_namestore_edit_phone.glade:416
-#: contrib/gnunet_namestore_edit_pkey.glade:364
-#: contrib/gnunet_namestore_edit_ptr.glade:364
-#: contrib/gnunet_namestore_edit_soa.glade:601
-#: contrib/gnunet_namestore_edit_srv.glade:488
-#: contrib/gnunet_namestore_edit_txt.glade:364
-#: contrib/gnunet_namestore_edit_vpn.glade:466
-msgid ""
-"Records with an absolute expiration time are valid until the specified date. "
-"You can change that date to an even later date, but you cannot set it to an "
-"earlier time (as other users may have cached the longer expiration time). "
-"Use absolute expiration times if you know that a particular record will only "
-"be valid until a particular day."
+#: contrib/gnunet_namestore_edit_box.glade:552
+#: contrib/gnunet_namestore_edit_tlsa.glade:332
+msgid "Service Cert. Constr."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:379
-#: contrib/gnunet_namestore_edit_aaaa.glade:361
-#: contrib/gnunet_namestore_edit_cname.glade:361
-#: contrib/gnunet_namestore_edit_gns2dns.glade:373
-#: contrib/gnunet_namestore_edit_leho.glade:378
-#: contrib/gnunet_namestore_edit_mx.glade:414
-#: contrib/gnunet_namestore_edit_phone.glade:430
-#: contrib/gnunet_namestore_edit_pkey.glade:378
-#: contrib/gnunet_namestore_edit_ptr.glade:378
-#: contrib/gnunet_namestore_edit_soa.glade:615
-#: contrib/gnunet_namestore_edit_srv.glade:502
-#: contrib/gnunet_namestore_edit_txt.glade:378
-#: contrib/gnunet_namestore_edit_vpn.glade:480
-msgid "Never"
+#: contrib/gnunet_namestore_edit_box.glade:571
+#: contrib/gnunet_namestore_edit_tlsa.glade:351
+msgid "Trust Anchor Assertion"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:384
-#: contrib/gnunet_namestore_edit_aaaa.glade:366
-#: contrib/gnunet_namestore_edit_cname.glade:366
-#: contrib/gnunet_namestore_edit_gns2dns.glade:377
-#: contrib/gnunet_namestore_edit_leho.glade:383
-#: contrib/gnunet_namestore_edit_mx.glade:419
-#: contrib/gnunet_namestore_edit_phone.glade:435
-#: contrib/gnunet_namestore_edit_pkey.glade:383
-#: contrib/gnunet_namestore_edit_ptr.glade:383
-#: contrib/gnunet_namestore_edit_soa.glade:620
-#: contrib/gnunet_namestore_edit_srv.glade:507
-#: contrib/gnunet_namestore_edit_txt.glade:383
-#: contrib/gnunet_namestore_edit_vpn.glade:485
-msgid ""
-"Records can be set to be valid forever. This is great if you are worried "
-"about censorship or certain that the mapping will never change.  Note that "
-"if you set a public record to never expire, you cannot later change it (as "
-"other users are free to cache the old value forever)."
+#: contrib/gnunet_namestore_edit_box.glade:589
+#: contrib/gnunet_namestore_edit_tlsa.glade:369
+msgid "Domain Issued Cert."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:406
-#: contrib/gnunet_namestore_edit_aaaa.glade:388
-#: contrib/gnunet_namestore_edit_cname.glade:388
-#: contrib/gnunet_namestore_edit_gns2dns.glade:399
-#: contrib/gnunet_namestore_edit_leho.glade:405
-#: contrib/gnunet_namestore_edit_mx.glade:441
-#: contrib/gnunet_namestore_edit_phone.glade:457
-#: contrib/gnunet_namestore_edit_pkey.glade:405
-#: contrib/gnunet_namestore_edit_ptr.glade:405
-#: contrib/gnunet_namestore_edit_soa.glade:642
-#: contrib/gnunet_namestore_edit_srv.glade:529
-#: contrib/gnunet_namestore_edit_txt.glade:405
-#: contrib/gnunet_namestore_edit_vpn.glade:507
-msgid ""
-"Select the date on which you want this record to expire. At that date, you "
-"can then create a new mapping or have a shadow record go automatically into "
-"effect.  Note that for public records you cannot change the expiration time "
-"to an earlier date after the fact."
+#: contrib/gnunet_namestore_edit_box.glade:620
+#: contrib/gnunet_namestore_edit_tlsa.glade:400
+#, fuzzy
+msgid "Selector:"
+msgstr "Chọn ô xem thử"
+
+#: contrib/gnunet_namestore_edit_box.glade:631
+#: contrib/gnunet_namestore_edit_tlsa.glade:411
+msgid "Full certificate"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:426
-#: contrib/gnunet_namestore_edit_aaaa.glade:408
-#: contrib/gnunet_namestore_edit_cname.glade:408
-#: contrib/gnunet_namestore_edit_gns2dns.glade:419
-#: contrib/gnunet_namestore_edit_leho.glade:425
-#: contrib/gnunet_namestore_edit_mx.glade:461
-#: contrib/gnunet_namestore_edit_phone.glade:477
-#: contrib/gnunet_namestore_edit_pkey.glade:425
-#: contrib/gnunet_namestore_edit_ptr.glade:425
-#: contrib/gnunet_namestore_edit_soa.glade:662
-#: contrib/gnunet_namestore_edit_srv.glade:549
-#: contrib/gnunet_namestore_edit_txt.glade:425
-#: contrib/gnunet_namestore_edit_vpn.glade:527
-msgid "Hours:"
+#: contrib/gnunet_namestore_edit_box.glade:649
+#: contrib/gnunet_namestore_edit_tlsa.glade:429
+msgid "Subject public key"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:439
-#: contrib/gnunet_namestore_edit_aaaa.glade:421
-#: contrib/gnunet_namestore_edit_cname.glade:421
-#: contrib/gnunet_namestore_edit_gns2dns.glade:432
-#: contrib/gnunet_namestore_edit_leho.glade:438
-#: contrib/gnunet_namestore_edit_mx.glade:474
-#: contrib/gnunet_namestore_edit_phone.glade:490
-#: contrib/gnunet_namestore_edit_pkey.glade:438
-#: contrib/gnunet_namestore_edit_ptr.glade:438
-#: contrib/gnunet_namestore_edit_soa.glade:675
-#: contrib/gnunet_namestore_edit_srv.glade:562
-#: contrib/gnunet_namestore_edit_txt.glade:438
-#: contrib/gnunet_namestore_edit_vpn.glade:540
-msgid "Which hour of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:680
+#: contrib/gnunet_namestore_edit_tlsa.glade:460
+msgid "Matching-Type:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:458
-#: contrib/gnunet_namestore_edit_aaaa.glade:440
-#: contrib/gnunet_namestore_edit_cname.glade:440
-#: contrib/gnunet_namestore_edit_gns2dns.glade:451
-#: contrib/gnunet_namestore_edit_leho.glade:457
-#: contrib/gnunet_namestore_edit_mx.glade:493
-#: contrib/gnunet_namestore_edit_phone.glade:509
-#: contrib/gnunet_namestore_edit_pkey.glade:457
-#: contrib/gnunet_namestore_edit_ptr.glade:457
-#: contrib/gnunet_namestore_edit_soa.glade:694
-#: contrib/gnunet_namestore_edit_srv.glade:581
-#: contrib/gnunet_namestore_edit_txt.glade:457
-#: contrib/gnunet_namestore_edit_vpn.glade:559
-#, fuzzy
-msgid "Minutes:"
-msgstr "phút"
+#: contrib/gnunet_namestore_edit_box.glade:691
+#: contrib/gnunet_namestore_edit_tlsa.glade:471
+msgid "Full contents"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:471
-#: contrib/gnunet_namestore_edit_aaaa.glade:453
-#: contrib/gnunet_namestore_edit_cname.glade:453
-#: contrib/gnunet_namestore_edit_gns2dns.glade:464
-#: contrib/gnunet_namestore_edit_leho.glade:470
-#: contrib/gnunet_namestore_edit_mx.glade:506
-#: contrib/gnunet_namestore_edit_phone.glade:522
-#: contrib/gnunet_namestore_edit_pkey.glade:470
-#: contrib/gnunet_namestore_edit_ptr.glade:470
-#: contrib/gnunet_namestore_edit_soa.glade:707
-#: contrib/gnunet_namestore_edit_srv.glade:594
-#: contrib/gnunet_namestore_edit_txt.glade:470
-#: contrib/gnunet_namestore_edit_vpn.glade:572
-msgid "Which minute of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:709
+#: contrib/gnunet_namestore_edit_tlsa.glade:489
+msgid "SHA-256"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:490
-#: contrib/gnunet_namestore_edit_aaaa.glade:472
-#: contrib/gnunet_namestore_edit_cname.glade:472
-#: contrib/gnunet_namestore_edit_gns2dns.glade:483
-#: contrib/gnunet_namestore_edit_leho.glade:489
-#: contrib/gnunet_namestore_edit_mx.glade:525
-#: contrib/gnunet_namestore_edit_phone.glade:541
-#: contrib/gnunet_namestore_edit_pkey.glade:489
-#: contrib/gnunet_namestore_edit_ptr.glade:489
-#: contrib/gnunet_namestore_edit_soa.glade:726
-#: contrib/gnunet_namestore_edit_srv.glade:613
-#: contrib/gnunet_namestore_edit_txt.glade:489
-#: contrib/gnunet_namestore_edit_vpn.glade:591
+#: contrib/gnunet_namestore_edit_box.glade:727
+#: contrib/gnunet_namestore_edit_tlsa.glade:507
+msgid "SHA-512"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:758
+#: contrib/gnunet_namestore_edit_cert.glade:277
+#: contrib/gnunet_namestore_edit_tlsa.glade:538
 #, fuzzy
-msgid "Seconds:"
-msgstr "giây"
+msgid "Certificate:"
+msgstr "Bộ nhận diện:"
 
-#: contrib/gnunet_namestore_edit_a.glade:503
-#: contrib/gnunet_namestore_edit_aaaa.glade:485
-#: contrib/gnunet_namestore_edit_cname.glade:485
-#: contrib/gnunet_namestore_edit_gns2dns.glade:496
-#: contrib/gnunet_namestore_edit_leho.glade:502
-#: contrib/gnunet_namestore_edit_mx.glade:538
-#: contrib/gnunet_namestore_edit_phone.glade:554
-#: contrib/gnunet_namestore_edit_pkey.glade:502
-#: contrib/gnunet_namestore_edit_ptr.glade:502
-#: contrib/gnunet_namestore_edit_soa.glade:739
-#: contrib/gnunet_namestore_edit_srv.glade:626
-#: contrib/gnunet_namestore_edit_txt.glade:502
-#: contrib/gnunet_namestore_edit_vpn.glade:604
-msgid "Which second of the day selected above should the record expire?"
+#: contrib/gnunet_namestore_edit_box.glade:808
+#: contrib/gnunet_namestore_edit_cert.glade:316
+msgid "Import ID:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:529
-#: contrib/gnunet_namestore_edit_aaaa.glade:511
-#: contrib/gnunet_namestore_edit_cname.glade:511
-#: contrib/gnunet_namestore_edit_gns2dns.glade:522
-#: contrib/gnunet_namestore_edit_leho.glade:528
-#: contrib/gnunet_namestore_edit_mx.glade:564
-#: contrib/gnunet_namestore_edit_phone.glade:580
-#: contrib/gnunet_namestore_edit_pkey.glade:528
-#: contrib/gnunet_namestore_edit_ptr.glade:528
-#: contrib/gnunet_namestore_edit_soa.glade:765
-#: contrib/gnunet_namestore_edit_srv.glade:652
-#: contrib/gnunet_namestore_edit_txt.glade:528
-#: contrib/gnunet_namestore_edit_vpn.glade:630
+#: contrib/gnunet_namestore_edit_box.glade:821
 msgid ""
-"Relative expiration time of the record.  The syntax is a number followed by "
-"a space and a time unit, possibly followed by additional numbers and time "
-"units. For example, you can specify \"1 d\" or \"6 h 30 m 15 s\". Use the "
-"drop-down menu to select from a set of common defaults. (Editing is not "
-"possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.) "
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_a.glade:553
-#: contrib/gnunet_namestore_edit_aaaa.glade:535
-#: contrib/gnunet_namestore_edit_cname.glade:535
-#: contrib/gnunet_namestore_edit_gns2dns.glade:546
-#: contrib/gnunet_namestore_edit_leho.glade:552
-#: contrib/gnunet_namestore_edit_mx.glade:588
-#: contrib/gnunet_namestore_edit_phone.glade:604
-#: contrib/gnunet_namestore_edit_pkey.glade:552
-#: contrib/gnunet_namestore_edit_ptr.glade:552
-#: contrib/gnunet_namestore_edit_soa.glade:789
-#: contrib/gnunet_namestore_edit_srv.glade:676
-#: contrib/gnunet_namestore_edit_txt.glade:552
-#: contrib/gnunet_namestore_edit_vpn.glade:654
+#: contrib/gnunet_namestore_edit_box.glade:844
+#: contrib/gnunet_namestore_edit_tlsa.glade:625
+msgid "Import Certificate from external source."
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_box.glade:869
+#: contrib/gnunet_namestore_edit_tlsa.glade:652
 #, fuzzy
-msgid "<b>Expiration Time</b>"
-msgstr "<b>Bài xuất bản</b>"
+msgid "<b>TLSA Record Information</b>"
+msgstr "<b>Cấu hình Trình nền GNUnet</b>"
+
+#: contrib/gnunet_namestore_edit_cert.glade:216
+msgid "Certificate Type:"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:227
+msgid "_X.509 (PKIX)"
+msgstr ""
+
+#: contrib/gnunet_namestore_edit_cert.glade:245
+msgid "_PGP"
+msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:329
 msgid ""
-"Enter the IPv6 address for the A record here. The format is the usual format "
-"(i.e. ::1)."
+"Enter identifier to import CERT information from the network.\n"
+"For example, for PKIX specify the DNS name.\n"
+"For PGP, specify the key identifier.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_aaaa.glade:222
-msgid "<b>Destination IPv6 Address</b>"
+#: contrib/gnunet_namestore_edit_cert.glade:352
+msgid "Import certificate from external source."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:199
+#: contrib/gnunet_namestore_edit_cert.glade:378
+#, fuzzy
+msgid "<b>DNS Domain Name</b>"
+msgstr "<b>Siêu dữ liệu</b>"
+
+#: contrib/gnunet_namestore_edit_cname.glade:197
 msgid "Enter the name for which this name is an alias."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_cname.glade:222
+#: contrib/gnunet_namestore_edit_cname.glade:220
 msgid "<b>Canonical Name (CNAME)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:155
+#: contrib/gnunet_namestore_edit_gns2dns.glade:154
 msgid ""
 "Enter the name of the DNS domain that this label delegates to.  Resolution "
 "will continue under the given target domain, asking the DNS server specified "
 "below."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:179
+#: contrib/gnunet_namestore_edit_gns2dns.glade:175
 msgid "<b>Name of the target DNS domain</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:212
+#: contrib/gnunet_namestore_edit_gns2dns.glade:208
 msgid ""
 "Enter the name of the DNS nameserver for the subzone.\n"
 "The specified name can be a GNS name, an IPv4 or IPv6 address or even a DNS "
@@ -2302,35 +3034,35 @@ msgid ""
 "that glue label.\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_gns2dns.glade:238
+#: contrib/gnunet_namestore_edit_gns2dns.glade:232
 msgid "<b>Name of the authoritative name server for the given name</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:216
+#: contrib/gnunet_namestore_edit_leho.glade:213
 msgid ""
 "Enter the DNS name under which this system is reachable using traditional "
 "DNS."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_leho.glade:239
+#: contrib/gnunet_namestore_edit_leho.glade:234
 msgid "<b>Legacy Hostname in DNS (LEHO)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:221
+#: contrib/gnunet_namestore_edit_mx.glade:218
 msgid "Enter the hostname of the mail server here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:240
+#: contrib/gnunet_namestore_edit_mx.glade:235
 msgid "distance"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:252
+#: contrib/gnunet_namestore_edit_mx.glade:247
 msgid ""
 "Enter the preference number (or distance, as smaller values are preferred) "
 "of the given mailserver here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_mx.glade:275
+#: contrib/gnunet_namestore_edit_mx.glade:268
 msgid "<b>Mail eXchanger record (MX)</b>"
 msgstr ""
 
@@ -2338,204 +3070,231 @@ msgstr ""
 msgid "Edit PHONE Record"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:222
+#: contrib/gnunet_namestore_edit_phone.glade:218
 #, fuzzy
 msgid "Peer"
 msgstr "Đồn_g đẳng"
 
-#: contrib/gnunet_namestore_edit_phone.glade:236
+#: contrib/gnunet_namestore_edit_phone.glade:232
 msgid "Enter the peer identity of the peer hosting the voice account here"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:255
+#: contrib/gnunet_namestore_edit_phone.glade:249
 msgid "line"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:268
+#: contrib/gnunet_namestore_edit_phone.glade:262
 msgid "Enter the phone line used for the user at the peer here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_phone.glade:291
+#: contrib/gnunet_namestore_edit_phone.glade:283
 #, fuzzy
 msgid "<b>PHONE record</b>"
 msgstr "<b>Từ khóa</b>"
 
-#: contrib/gnunet_namestore_edit_pkey.glade:216
+#: contrib/gnunet_namestore_edit_pkey.glade:213
 msgid "Enter the public key of the authority here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_pkey.glade:239
+#: contrib/gnunet_namestore_edit_pkey.glade:234
 msgid "<b>GNS authority for the subzone (PKEY)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_ptr.glade:239
+#: contrib/gnunet_namestore_edit_ptr.glade:234
 msgid "<b>Canonical name (PTR)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:246
+#: contrib/gnunet_namestore_edit_soa.glade:243
 msgid "Source host:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:257
+#: contrib/gnunet_namestore_edit_soa.glade:254
 msgid "Contact e-mail:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:270
+#: contrib/gnunet_namestore_edit_soa.glade:267
 msgid "Serial number:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:283
+#: contrib/gnunet_namestore_edit_soa.glade:280
 msgid "Refresh time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:296
+#: contrib/gnunet_namestore_edit_soa.glade:293
 msgid "Retry time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:309
+#: contrib/gnunet_namestore_edit_soa.glade:306
 msgid "Expire time:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:322
+#: contrib/gnunet_namestore_edit_soa.glade:319
 msgid "Minimum TTL:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:335
+#: contrib/gnunet_namestore_edit_soa.glade:332
 msgid "This number should be incremented for every zone update."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:356
-#: contrib/gnunet_namestore_edit_soa.glade:376
-#: contrib/gnunet_namestore_edit_soa.glade:396
-#: contrib/gnunet_namestore_edit_soa.glade:416
+#: contrib/gnunet_namestore_edit_soa.glade:351
+#: contrib/gnunet_namestore_edit_soa.glade:369
+#: contrib/gnunet_namestore_edit_soa.glade:387
+#: contrib/gnunet_namestore_edit_soa.glade:405
 msgid "The value is in seconds."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:436
+#: contrib/gnunet_namestore_edit_soa.glade:423
 msgid "Name of the host responsible for the zone."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:453
+#: contrib/gnunet_namestore_edit_soa.glade:438
 msgid "Note that a \".\" is used instead of \"@\" in the e-mail address!"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_soa.glade:476
+#: contrib/gnunet_namestore_edit_soa.glade:459
 msgid "<b>Start of Authority (SOA) information</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:243
-msgid "Weight:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:256
-#: contrib/gnunet_setup_main_window.glade:478
-#: contrib/gnunet_setup_main_window.glade:2621
-msgid "Port:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:269
-msgid "Target:"
+#: contrib/gnunet_namestore_edit_tlsa.glade:148
+msgid "443"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:282
-msgid "Priority of the target, lower values means more preferred"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_srv.glade:300
-msgid "Relative weight for records with the same priority"
+#: contrib/gnunet_namestore_edit_tlsa.glade:199
+msgid "_Label"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:320
-msgid "TCP or UDP port on which the service is to be found"
+#: contrib/gnunet_namestore_edit_tlsa.glade:588
+msgid "Import from:"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:340
-msgid "Canonical hostname of the machine providing the service"
+#: contrib/gnunet_namestore_edit_tlsa.glade:601
+msgid ""
+"Enter identifier to import certificate information from the network.\n"
+"For example, for X.509 specify the DNS domain name.\n"
+"For PGP, specify the key identifier (not implemented).\n"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_srv.glade:363
-#, fuzzy
-msgid "<b>Service record (SRV)</b>"
-msgstr "<b>Cấu hình Trình nền GNUnet</b>"
-
-#: contrib/gnunet_namestore_edit_txt.glade:239
+#: contrib/gnunet_namestore_edit_txt.glade:233
 msgid "<b>Text value (TXT)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:217
-msgid "Protocol:"
-msgstr ""
-
-#: contrib/gnunet_namestore_edit_vpn.glade:228
+#: contrib/gnunet_namestore_edit_vpn.glade:225
 #, fuzzy
 msgid "Peer:"
 msgstr "Đồn_g đẳng"
 
-#: contrib/gnunet_namestore_edit_vpn.glade:256
-#: contrib/gnunet_setup_main_window.glade:1443
+#: contrib/gnunet_namestore_edit_vpn.glade:253
+#: contrib/gnunet_setup_main_window.glade:1755
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:261
+#: contrib/gnunet_namestore_edit_vpn.glade:257
 msgid "Service is available via TCP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:273
-#: contrib/gnunet_setup_main_window.glade:1644
+#: contrib/gnunet_namestore_edit_vpn.glade:270
+#: contrib/gnunet_setup_main_window.glade:1952
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:278
+#: contrib/gnunet_namestore_edit_vpn.glade:274
 msgid "Service is available via UDP"
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:299
+#: contrib/gnunet_namestore_edit_vpn.glade:296
 msgid ""
 "Enter the identity (gnunet-peerinfo -s) of the peer offering the service "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:319
+#: contrib/gnunet_namestore_edit_vpn.glade:314
 msgid ""
 "Each GNUnet service is identified by an identiifer (name, password) that can "
 "be freely chosen by the service provider.  This string should be entered "
 "here."
 msgstr ""
 
-#: contrib/gnunet_namestore_edit_vpn.glade:341
+#: contrib/gnunet_namestore_edit_vpn.glade:334
 msgid "<b>GNUnet VPN address (GNS only)</b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:11
+#: contrib/gnunet_namestore_gtk_main_window.glade:12
+msgid "Edit GNS entry"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:13
+#, fuzzy
+msgid "Edit"
+msgstr "T_hoát"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:108
+msgid "SRV"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:112
+msgid "TLSA"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-namestore-gtk"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:41
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+#: contrib/gnunet_namestore_gtk_main_window.glade:225
+msgid ""
+"The label will be the TLD of the zone for you, and the suggested nickname "
+"for the zone for other users.  It must be a valid DNS label."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:227
+msgid "Zone label:"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:258
+msgid "Create a new zone with the given label"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:277
+msgid "Create a new zone (GNU Name System top-level domain)"
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:278
+msgid " _Add Zone"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:82
-msgid "Preferred zone name (NICK):"
+#: contrib/gnunet_namestore_gtk_main_window.glade:357
+msgid "Select zone to edit (below) or delete (button)"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:165
+#: contrib/gnunet_namestore_gtk_main_window.glade:358
+#, fuzzy
+msgid " _Select Zone"
+msgstr "Chọn mọi tập tin"
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:400
 #, fuzzy
 msgid "QR code for the selected zone"
 msgstr "Đóng tìm kiếm đã chọn"
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:202
+#: contrib/gnunet_namestore_gtk_main_window.glade:421
+msgid "Saves QR code with zone public key to disk."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:438
+msgid "Copies zone public key as text to clipboard."
+msgstr ""
+
+#: contrib/gnunet_namestore_gtk_main_window.glade:483
 msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:407
-msgid "Edit GNS entry"
+#: contrib/gnunet_namestore_gtk_main_window.glade:624
+msgid "  _Edit Zone "
 msgstr ""
 
-#: contrib/gnunet_namestore_gtk_main_window.glade:408
-#, fuzzy
-msgid "Edit"
-msgstr "T_hoát"
+#: contrib/gnunet_namestore_gtk_main_window.glade:640
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
 
 #: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 #, fuzzy
@@ -3309,112 +4068,116 @@ msgstr ""
 "Phan Vinh Thinh <address@hidden>\n"
 "Daniel Nylander <address@hidden>\n"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:76
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:97
+msgid "ATS"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:103
 msgid "CORE"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:82
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:109
 msgid "TRANSPORT"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:88
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:114
 msgid "PLUGIN"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:94
-msgid "ATS"
-msgstr ""
-
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:100
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:125
 #, fuzzy
 msgid "Address valid?"
 msgstr "Địa chỉ"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:105
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:130
 #, fuzzy
 msgid "gnunet-peerinfo-gtk"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:134
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:160
 msgid "Display information about this version of gnunet-peerinfo-gtk"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:190
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:218
 #, fuzzy
 msgid "Friend"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:339
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:369
 msgid "Plugin"
 msgstr ""
 
-#: contrib/gnunet_peerinfo_gtk_main_window.glade:354
-#, fuzzy
-msgid "State"
-msgstr "Trạng thái"
-
 #: contrib/gnunet_setup_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-setup"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:22
+#: contrib/gnunet_setup_main_window.glade:320
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:111
+#: contrib/gnunet_setup_main_window.glade:411
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:122
+#: contrib/gnunet_setup_main_window.glade:422
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:127
+#: contrib/gnunet_setup_main_window.glade:427
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:141
+#: contrib/gnunet_setup_main_window.glade:440
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:145
+#: contrib/gnunet_setup_main_window.glade:444
 msgid ""
 "Hostlist servers are used to find other peers.  Here you can choose to offer "
 "a hostlist or simply configure which hostlists by other peers you want to "
 "use."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:159
+#: contrib/gnunet_setup_main_window.glade:457
 #, fuzzy
 msgid "File _Sharing"
 msgstr "C_hia sẻ tập tin"
 
-#: contrib/gnunet_setup_main_window.glade:163
+#: contrib/gnunet_setup_main_window.glade:461
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:178
-msgid "PT/VPN"
+#: contrib/gnunet_setup_main_window.glade:475
+msgid "VPN"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:479
+msgid ""
+"Using the VPN subsystem you can tunnel your Internet traffic over GNUnet to "
+"a GNUnet exit. This can be used to access GNUnet-specific services hosted by "
+"other peer.  "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:492
+msgid "VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:182
+#: contrib/gnunet_setup_main_window.glade:495
 msgid ""
 "Using the PT/VPN subsystems you can tunnel your Internet traffic over "
-"GNUnet.  This is useful if you want to access the IPv4-Internet if you only "
-"have IPv6-connectivity or vice versa.  Furthermore, if you are only "
-"connected to other peers using WLAN, you could also get Internet access in "
-"the first place by routing IP traffic over GNUnet."
+"GNUnet.  PT adds \"protocol translation\", which is useful if you want to "
+"access the IPv4-Internet if you only have IPv6-connectivity or vice versa.  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:196
+#: contrib/gnunet_setup_main_window.glade:508
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:200
+#: contrib/gnunet_setup_main_window.glade:512
 msgid ""
 "By offering an EXIT service, you can allow other peers to use your Internet "
 "connection to reach the IPv4 and/or IPv6 Internet.  Naturally, as your "
@@ -3425,445 +4188,468 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:214
+#: contrib/gnunet_setup_main_window.glade:525
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:218
+#: contrib/gnunet_setup_main_window.glade:529
 msgid ""
 "The GNS is GNUnet's replacement for DNS.  Enabling this subsystem will make "
 "the \".gnunet\" TLD available on your system.  You will be in charge of your "
 "\".gnunet\" TLD."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:238
+#: contrib/gnunet_setup_main_window.glade:548
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:267
+#: contrib/gnunet_setup_main_window.glade:577
 #, fuzzy
 msgid "F_2F only"
 msgstr "Chỉ tập ti_n"
 
-#: contrib/gnunet_setup_main_window.glade:295
+#: contrib/gnunet_setup_main_window.glade:593
 msgid "Ed_it List of Friends"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:325
+#: contrib/gnunet_setup_main_window.glade:612
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:360
+#: contrib/gnunet_setup_main_window.glade:646
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:393
+#: contrib/gnunet_setup_main_window.glade:664
+msgid "_General"
+msgstr "Chun_g"
+
+#: contrib/gnunet_setup_main_window.glade:698
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:409
+#: contrib/gnunet_setup_main_window.glade:713
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:440
+#: contrib/gnunet_setup_main_window.glade:744
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:456
+#: contrib/gnunet_setup_main_window.glade:759
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:531
+#: contrib/gnunet_setup_main_window.glade:844
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:607
+#: contrib/gnunet_setup_main_window.glade:935
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:625
-msgid "_General"
-msgstr "Chun_g"
-
-#: contrib/gnunet_setup_main_window.glade:659
-msgid "Max. download bandwidth (B/s):"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:691
-msgid "Max. upload bandwidth (B/s)"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:733
+#: contrib/gnunet_setup_main_window.glade:970
+#: contrib/gnunet_setup_main_window.glade:2173
+#: contrib/gnunet_setup_main_window.glade:2645
 #, fuzzy
-msgid "<b>Bandwidth Configuration</b>"
-msgstr "<b>Cấu hình Trình nền GNUnet</b>"
-
-#: contrib/gnunet_setup_main_window.glade:765
-msgid "Peer is behind _NAT"
-msgstr ""
+msgid "_Proxy type:"
+msgstr "_Xuất bản"
 
-#: contrib/gnunet_setup_main_window.glade:769
-msgid ""
-"Check this box if your machine is behind a NAT box (router that performs "
-"network address translation).  Leave off if your machine has a globally "
-"unique IPv4 address.  NAT options only impact IPv4 addresses at this time."
+#: contrib/gnunet_setup_main_window.glade:987
+#: contrib/gnunet_setup_main_window.glade:2190
+#: contrib/gnunet_setup_main_window.glade:2662
+msgid "no proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:783
-#, fuzzy
-msgid "Attempt automatic configuration"
-msgstr "Khởi chạy t_rợ lý cấu hình"
-
-#: contrib/gnunet_setup_main_window.glade:798
-msgid "Disable IPv_6 support"
+#: contrib/gnunet_setup_main_window.glade:1002
+#: contrib/gnunet_setup_main_window.glade:2205
+#: contrib/gnunet_setup_main_window.glade:2677
+msgid "HTTP proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:802
-msgid ""
-"Disable advertising IPv6 addresses. Check this box if you know that your "
-"system has no IPv6 Internet connectivity."
+#: contrib/gnunet_setup_main_window.glade:1017
+msgid "HTTP 1.0 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:845
-msgid "NAT ports have been opened manually"
+#: contrib/gnunet_setup_main_window.glade:1032
+#: contrib/gnunet_setup_main_window.glade:2221
+#: contrib/gnunet_setup_main_window.glade:2692
+msgid "SOCKS v4 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:849
-msgid ""
-"Set this option if you have configured your NAT to forward the ports for the "
-"various enabled GNUnet transports.  If the external ports are different, the "
-"respective values of the external port should be specified under "
-"\"advertised port\" for the respective transport. You also need to specify "
-"the \"External (public) IPv4 address\" of your NAT box below."
+#: contrib/gnunet_setup_main_window.glade:1047
+#: contrib/gnunet_setup_main_window.glade:2237
+#: contrib/gnunet_setup_main_window.glade:2707
+msgid "SOCKS v4a proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:861
-msgid "Enable NAT traversal via UPnP or PMP"
+#: contrib/gnunet_setup_main_window.glade:1062
+#: contrib/gnunet_setup_main_window.glade:2253
+#: contrib/gnunet_setup_main_window.glade:2722
+msgid "SOCKS v5 proxy"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:865
-msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+#: contrib/gnunet_setup_main_window.glade:1077
+#: contrib/gnunet_setup_main_window.glade:2269
+#: contrib/gnunet_setup_main_window.glade:2737
+msgid "SOCKS v5 proxy with hostname"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:877
-msgid "Enable NAT traversal using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1113
+#: contrib/gnunet_setup_main_window.glade:2309
+#: contrib/gnunet_setup_main_window.glade:2776
+msgid "Proxy hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:881
-msgid ""
-"This option enables the use of the \"Autonomous NAT Traversal\" method "
-"(presented at P2P 2010).  It requires gnunet-helper-nat-server to be "
-"installed SUID on the local system."
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1151
+#: contrib/gnunet_setup_main_window.glade:2347
+#: contrib/gnunet_setup_main_window.glade:2814
+#, fuzzy
+msgid "Proxy username:"
+msgstr "_Tên tập tin:"
 
-#: contrib/gnunet_setup_main_window.glade:899
-msgid ""
-"Globally visible IP address of your system (IP address of the external "
-"interface of your NAT).  You can also specify a hostname, in which case "
-"GNUnet will periodically look up the hostname in DNS to determine our "
-"external IP address (DynDNS setup)."
+#: contrib/gnunet_setup_main_window.glade:1189
+#: contrib/gnunet_setup_main_window.glade:2385
+#: contrib/gnunet_setup_main_window.glade:2852
+msgid "Proxy password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:900
-msgid "External (public) IPv4 address:"
-msgstr ""
+#: contrib/gnunet_setup_main_window.glade:1227
+#, fuzzy
+msgid "<b>Proxy configuration</b>"
+msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:937
-msgid "Enable connecting to NATed peers using ICMP method"
+#: contrib/gnunet_setup_main_window.glade:1248
+msgid "_Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:941
-msgid ""
-"This method allows this peer to initiate connections to NATed peers using "
-"the 'Autonomous NAT traversal' method (presented at P2P 2010). It requires "
-"having gnunet-helper-nat-client installed SUID on the local system."
+#: contrib/gnunet_setup_main_window.glade:1283
+msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:960
-msgid ""
-"Specify the IPv4 address of your computers main network interface (typically "
-"eth0 or wlan0)."
+#: contrib/gnunet_setup_main_window.glade:1294
+msgid "Max. upload bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:961
-msgid "Internal (private) IPv4 address:"
+#: contrib/gnunet_setup_main_window.glade:1306
+#: contrib/gnunet_setup_main_window.glade:1323
+msgid "65536"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1018
+#: contrib/gnunet_setup_main_window.glade:1343
 #, fuzzy
-msgid "<b>NAT Traversal Configuration</b>"
+msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:1039
+#: contrib/gnunet_setup_main_window.glade:1363
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1071
+#: contrib/gnunet_setup_main_window.glade:1396
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1082
+#: contrib/gnunet_setup_main_window.glade:1407
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1101
-#: contrib/gnunet_setup_main_window.glade:3995
+#: contrib/gnunet_setup_main_window.glade:1425
+#: contrib/gnunet_setup_main_window.glade:4773
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1119
+#: contrib/gnunet_setup_main_window.glade:1442
 msgid "_HTTP Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1138
+#: contrib/gnunet_setup_main_window.glade:1460
 msgid "HTT_P Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1157
+#: contrib/gnunet_setup_main_window.glade:1478
 msgid "HTTPS _Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1176
+#: contrib/gnunet_setup_main_window.glade:1496
 msgid "HTTPS _Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1195
+#: contrib/gnunet_setup_main_window.glade:1514
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1212
+#: contrib/gnunet_setup_main_window.glade:1530
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1252
-#: contrib/gnunet_setup_main_window.glade:1463
-#: contrib/gnunet_setup_main_window.glade:1667
-#: contrib/gnunet_setup_main_window.glade:1873
+#: contrib/gnunet_setup_main_window.glade:1570
+#: contrib/gnunet_setup_main_window.glade:1776
+#: contrib/gnunet_setup_main_window.glade:1976
+#: contrib/gnunet_setup_main_window.glade:2448
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1286
+#: contrib/gnunet_setup_main_window.glade:1601
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1311
-#: contrib/gnunet_setup_main_window.glade:1510
-#: contrib/gnunet_setup_main_window.glade:1714
-#: contrib/gnunet_setup_main_window.glade:1920
+#: contrib/gnunet_setup_main_window.glade:1626
+#: contrib/gnunet_setup_main_window.glade:1820
+#: contrib/gnunet_setup_main_window.glade:2020
+#: contrib/gnunet_setup_main_window.glade:2492
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1345
-#: contrib/gnunet_setup_main_window.glade:1542
-#: contrib/gnunet_setup_main_window.glade:1748
-#: contrib/gnunet_setup_main_window.glade:1954
+#: contrib/gnunet_setup_main_window.glade:1657
+#: contrib/gnunet_setup_main_window.glade:1850
+#: contrib/gnunet_setup_main_window.glade:2051
+#: contrib/gnunet_setup_main_window.glade:2523
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1378
-#: contrib/gnunet_setup_main_window.glade:1576
-#: contrib/gnunet_setup_main_window.glade:1782
-#: contrib/gnunet_setup_main_window.glade:1988
-#: contrib/gnunet_setup_main_window.glade:2681
-#: contrib/gnunet_setup_main_window.glade:2783
-#: contrib/gnunet_setup_main_window.glade:3100
-#: contrib/gnunet_setup_main_window.glade:4245
+#: contrib/gnunet_setup_main_window.glade:1690
+#: contrib/gnunet_setup_main_window.glade:1884
+#: contrib/gnunet_setup_main_window.glade:2085
+#: contrib/gnunet_setup_main_window.glade:2557
+#: contrib/gnunet_setup_main_window.glade:3494
+#: contrib/gnunet_setup_main_window.glade:3593
+#: contrib/gnunet_setup_main_window.glade:3902
+#: contrib/gnunet_setup_main_window.glade:5031
 #, fuzzy
 msgid "Test configuration"
 msgstr "Cấu hình cấp c_ao"
 
-#: contrib/gnunet_setup_main_window.glade:1382
-#: contrib/gnunet_setup_main_window.glade:1580
-#: contrib/gnunet_setup_main_window.glade:1786
-#: contrib/gnunet_setup_main_window.glade:1992
+#: contrib/gnunet_setup_main_window.glade:1694
+#: contrib/gnunet_setup_main_window.glade:1888
+#: contrib/gnunet_setup_main_window.glade:2089
+#: contrib/gnunet_setup_main_window.glade:2561
 msgid ""
 "Test your network configuration by contacting a public gnunet-nat-server and "
 "asking it to establish a connection to your system for testing.  This test "
 "can only work if you are not running your peer at the time you run the test."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1395
-#: contrib/gnunet_setup_main_window.glade:1593
-#: contrib/gnunet_setup_main_window.glade:1799
-#: contrib/gnunet_setup_main_window.glade:2005
-#: contrib/gnunet_setup_main_window.glade:2697
-#: contrib/gnunet_setup_main_window.glade:2799
-#: contrib/gnunet_setup_main_window.glade:3116
-#: contrib/gnunet_setup_main_window.glade:4261
+#: contrib/gnunet_setup_main_window.glade:1707
+#: contrib/gnunet_setup_main_window.glade:1901
+#: contrib/gnunet_setup_main_window.glade:2102
+#: contrib/gnunet_setup_main_window.glade:2574
+#: contrib/gnunet_setup_main_window.glade:3510
+#: contrib/gnunet_setup_main_window.glade:3609
+#: contrib/gnunet_setup_main_window.glade:3918
+#: contrib/gnunet_setup_main_window.glade:5047
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1408
-#: contrib/gnunet_setup_main_window.glade:1606
-#: contrib/gnunet_setup_main_window.glade:1812
-#: contrib/gnunet_setup_main_window.glade:2018
+#: contrib/gnunet_setup_main_window.glade:1720
+#: contrib/gnunet_setup_main_window.glade:1914
+#: contrib/gnunet_setup_main_window.glade:2115
+#: contrib/gnunet_setup_main_window.glade:2587
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1462
-#: contrib/gnunet_setup_main_window.glade:1666
-#: contrib/gnunet_setup_main_window.glade:1872
+#: contrib/gnunet_setup_main_window.glade:1775
+#: contrib/gnunet_setup_main_window.glade:1975
+#: contrib/gnunet_setup_main_window.glade:2447
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:1850
-msgid "HTTP"
+#: contrib/gnunet_setup_main_window.glade:2153
+msgid "HTTP-Server"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2424
+msgid "HTTP-Client"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:2625
+msgid "HTTPS-Server"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2056
-msgid "HTTPS"
+#: contrib/gnunet_setup_main_window.glade:2891
+msgid "HTTPS-Client"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2079
+#: contrib/gnunet_setup_main_window.glade:2915
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2098
+#: contrib/gnunet_setup_main_window.glade:2935
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2144
+#: contrib/gnunet_setup_main_window.glade:2978
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2166
+#: contrib/gnunet_setup_main_window.glade:3000
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2179
+#: contrib/gnunet_setup_main_window.glade:3013
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2208
+#: contrib/gnunet_setup_main_window.glade:3043
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2225
+#: contrib/gnunet_setup_main_window.glade:3059
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2247
+#: contrib/gnunet_setup_main_window.glade:3080
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Ứng dụng đang chạy</b>"
 
-#: contrib/gnunet_setup_main_window.glade:2281
-#: contrib/gnunet_setup_main_window.glade:4103
+#: contrib/gnunet_setup_main_window.glade:3115
+#: contrib/gnunet_setup_main_window.glade:4881
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2297
-#: contrib/gnunet_setup_main_window.glade:2420
-#: contrib/gnunet_setup_main_window.glade:2891
-#: contrib/gnunet_setup_main_window.glade:3014
-#: contrib/gnunet_setup_main_window.glade:3033
-#: contrib/gnunet_setup_main_window.glade:4119
-#: contrib/gnunet_setup_main_window.glade:4181
+#: contrib/gnunet_setup_main_window.glade:3131
+#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:3702
+#: contrib/gnunet_setup_main_window.glade:3818
+#: contrib/gnunet_setup_main_window.glade:3838
+#: contrib/gnunet_setup_main_window.glade:4897
+#: contrib/gnunet_setup_main_window.glade:4955
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2314
-#: contrib/gnunet_setup_main_window.glade:2671
+#: contrib/gnunet_setup_main_window.glade:3147
+#: contrib/gnunet_setup_main_window.glade:3484
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2332
-#: contrib/gnunet_setup_main_window.glade:2773
-#: contrib/gnunet_setup_main_window.glade:2926
-#: contrib/gnunet_setup_main_window.glade:3090
-#: contrib/gnunet_setup_main_window.glade:4137
-#: contrib/gnunet_setup_main_window.glade:4235
+#: contrib/gnunet_setup_main_window.glade:3163
+#: contrib/gnunet_setup_main_window.glade:3583
+#: contrib/gnunet_setup_main_window.glade:3734
+#: contrib/gnunet_setup_main_window.glade:3892
+#: contrib/gnunet_setup_main_window.glade:4913
+#: contrib/gnunet_setup_main_window.glade:5021
 #, fuzzy
 msgid "Postgres"
 msgstr "Tiến hành"
 
-#: contrib/gnunet_setup_main_window.glade:2370
-#: contrib/gnunet_setup_main_window.glade:2964
+#: contrib/gnunet_setup_main_window.glade:3200
+#: contrib/gnunet_setup_main_window.glade:3771
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2413
-#: contrib/gnunet_setup_main_window.glade:3007
-#: contrib/gnunet_setup_main_window.glade:4174
+#: contrib/gnunet_setup_main_window.glade:3240
+#: contrib/gnunet_setup_main_window.glade:3811
+#: contrib/gnunet_setup_main_window.glade:4948
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2438
+#: contrib/gnunet_setup_main_window.glade:3266
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2452
+#: contrib/gnunet_setup_main_window.glade:3280
 #, fuzzy
 msgid "gnunet"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_setup_main_window.glade:2482
+#: contrib/gnunet_setup_main_window.glade:3307
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Tập tin _cấu hình dùng cho gnunetd:"
 
-#: contrib/gnunet_setup_main_window.glade:2517
+#: contrib/gnunet_setup_main_window.glade:3342
 #, fuzzy
 msgid "Username:"
 msgstr "_Tên tập tin:"
 
-#: contrib/gnunet_setup_main_window.glade:2548
+#: contrib/gnunet_setup_main_window.glade:3370
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2589
+#: contrib/gnunet_setup_main_window.glade:3408
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2603
+#: contrib/gnunet_setup_main_window.glade:3422
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2709
-#: contrib/gnunet_setup_main_window.glade:2811
-#: contrib/gnunet_setup_main_window.glade:3128
-#: contrib/gnunet_setup_main_window.glade:4273
+#: contrib/gnunet_setup_main_window.glade:3522
+#: contrib/gnunet_setup_main_window.glade:3621
+#: contrib/gnunet_setup_main_window.glade:3930
+#: contrib/gnunet_setup_main_window.glade:5059
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2732
-#: contrib/gnunet_setup_main_window.glade:3048
-#: contrib/gnunet_setup_main_window.glade:4195
+#: contrib/gnunet_setup_main_window.glade:3545
+#: contrib/gnunet_setup_main_window.glade:3853
+#: contrib/gnunet_setup_main_window.glade:4974
 #, fuzzy
 msgid "Configuration:"
 msgstr "Cấu hình cấp c_ao"
 
-#: contrib/gnunet_setup_main_window.glade:2841
+#: contrib/gnunet_setup_main_window.glade:3651
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2875
+#: contrib/gnunet_setup_main_window.glade:3686
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:2908
+#: contrib/gnunet_setup_main_window.glade:3718
 msgid "Memory"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3158
+#: contrib/gnunet_setup_main_window.glade:3960
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3178
+#: contrib/gnunet_setup_main_window.glade:3980
 #, fuzzy
 msgid "_File Sharing"
 msgstr "C_hia sẻ tập tin"
 
-#: contrib/gnunet_setup_main_window.glade:3211
+#: contrib/gnunet_setup_main_window.glade:4015
+msgid "_Interface name:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4029
+msgid ""
+"Name of the TUN interface GNUnet will create for intercepting outgoing "
+"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
+"always fine."
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4055
+msgid "IPv4 address for interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4082
+#: contrib/gnunet_setup_main_window.glade:4146
+#: contrib/gnunet_setup_main_window.glade:4502
+#: contrib/gnunet_setup_main_window.glade:4568
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4119
+msgid "IPv6 address for interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_main_window.glade:4184
+#, fuzzy
+msgid "<b>VPN Interface Configuration</b>"
+msgstr "<b>Cấu hình Trình nền GNUnet</b>"
+
+#: contrib/gnunet_setup_main_window.glade:4217
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3215
+#: contrib/gnunet_setup_main_window.glade:4221
 msgid ""
 "By enabling this option, all of your IPv4-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3871,11 +4657,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3227
+#: contrib/gnunet_setup_main_window.glade:4233
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3231
+#: contrib/gnunet_setup_main_window.glade:4237
 msgid ""
 "By enabling this option, all of your IPv6-Internet traffic will be routed "
 "over GNUnet to a GNUnet exit node.  Note that this will enable other GNUnet "
@@ -3883,12 +4669,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3243
+#: contrib/gnunet_setup_main_window.glade:4249
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Dữ liệu gửi đến"
 
-#: contrib/gnunet_setup_main_window.glade:3247
+#: contrib/gnunet_setup_main_window.glade:4253
 msgid ""
 "Enabling this option will cause your DNS traffic to be routed via the GNUnet "
 "network to some other peer offering DNS exit functionality. This is needed "
@@ -3899,173 +4685,138 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3273
+#: contrib/gnunet_setup_main_window.glade:4279
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3307
-msgid "_Interface name:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3321
-msgid ""
-"Name of the TUN interface GNUnet will create for intercepting outgoing "
-"Internet traffic from your machine.  The default \"gnunet-vpn\" is almost "
-"always fine."
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3349
-msgid "IPv4 address for interface:"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3378
-#: contrib/gnunet_setup_main_window.glade:3446
-#: contrib/gnunet_setup_main_window.glade:3718
-#: contrib/gnunet_setup_main_window.glade:3788
-msgid "/"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3417
-msgid "IPv6 address for interface: "
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:3486
-#, fuzzy
-msgid "<b>VPN Interface Configuration</b>"
-msgstr "<b>Cấu hình Trình nền GNUnet</b>"
-
-#: contrib/gnunet_setup_main_window.glade:3507
+#: contrib/gnunet_setup_main_window.glade:4299
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3508
-msgid "_VPN"
+#: contrib/gnunet_setup_main_window.glade:4300
+msgid "_VPN/PT"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3541
+#: contrib/gnunet_setup_main_window.glade:4334
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3557
+#: contrib/gnunet_setup_main_window.glade:4349
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3561
+#: contrib/gnunet_setup_main_window.glade:4353
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3574
+#: contrib/gnunet_setup_main_window.glade:4365
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3578
+#: contrib/gnunet_setup_main_window.glade:4369
 msgid ""
 "This option will allow other peers to send IPv6 traffic to the Internet "
 "using your network connection.  You should make sure that you have IPv6-"
 "support before enabling this option."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3605
+#: contrib/gnunet_setup_main_window.glade:4395
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3646
+#: contrib/gnunet_setup_main_window.glade:4434
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3659
+#: contrib/gnunet_setup_main_window.glade:4447
 msgid ""
 "Name of the TUN interface GNUnet will create for Internet traffic exiting "
 "GNUnet via your machine.  The default \"gnunet-exit\" is almost always fine."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3688
+#: contrib/gnunet_setup_main_window.glade:4474
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3701
+#: contrib/gnunet_setup_main_window.glade:4487
 msgid ""
 "Use a private IPv4 network here that does not conflict with your existing "
 "setup (i.e. something like 10.53.0.1/255.255.0.0 or "
 "192.168.0.1/255.255.0.0).  "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3758
+#: contrib/gnunet_setup_main_window.glade:4540
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3771
+#: contrib/gnunet_setup_main_window.glade:4553
 msgid ""
 "This should be a globally routed IPv6 subnet of your host.  Alternatively, "
 "if your kernel supports IPv6-NAT, you can pick any site-local prefix and "
 "manually configure IPv6-NAT."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3828
+#: contrib/gnunet_setup_main_window.glade:4606
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3863
+#: contrib/gnunet_setup_main_window.glade:4642
 msgid "IPv4:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3904
+#: contrib/gnunet_setup_main_window.glade:4681
 msgid "IPv6:"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:3945
+#: contrib/gnunet_setup_main_window.glade:4720
 #, fuzzy
 msgid "<b>Exit policy</b>"
 msgstr "<b>Bài xuất bản</b>"
 
-#: contrib/gnunet_setup_main_window.glade:3977
+#: contrib/gnunet_setup_main_window.glade:4755
 #, fuzzy
 msgid "_Identifier"
 msgstr "Bộ nhận diện"
 
-#: contrib/gnunet_setup_main_window.glade:4010
+#: contrib/gnunet_setup_main_window.glade:4788
 msgid "_Port"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4027
+#: contrib/gnunet_setup_main_window.glade:4805
 #, fuzzy
 msgid "_Destination"
 msgstr "Mô tả"
 
-#: contrib/gnunet_setup_main_window.glade:4046
+#: contrib/gnunet_setup_main_window.glade:4824
 msgid ""
 "You can configure TCP/UDP services offered by your peer here.  This is "
 "GNUnet's equivalent to Tor's \"hidden services\" concept."
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4047
+#: contrib/gnunet_setup_main_window.glade:4825
 msgid "<b>Hosted TCP/UDP Services</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4068
+#: contrib/gnunet_setup_main_window.glade:4845
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4303
+#: contrib/gnunet_setup_main_window.glade:5089
 msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_main_window.glade:4324
-msgid "<b>Configure GNUnet Naming System</b>"
-msgstr ""
-
-#: contrib/gnunet_setup_main_window.glade:4345
+#: contrib/gnunet_setup_main_window.glade:5108
 #, fuzzy
 msgid "GNS & N_amestore"
 msgstr "Miề_n tên"
 
-#: contrib/gnunet_setup_main_window.glade:4362
+#: contrib/gnunet_setup_main_window.glade:5125
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
@@ -4074,12 +4825,12 @@ msgstr ""
 msgid "About gnunet-statistics-gtk"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:6
+#: contrib/gnunet_statistics_gtk_main_window.glade:7
 #, fuzzy
 msgid "gnunet-statistics-gtk"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:36
+#: contrib/gnunet_statistics_gtk_main_window.glade:38
 msgid "Display information about this version of gnunet-statistics-gtk"
 msgstr ""
 
@@ -4088,15 +4839,35 @@ msgstr ""
 msgid "_Connections"
 msgstr "Khả năng kết nối"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:97
+#: contrib/gnunet_statistics_gtk_main_window.glade:96
 #, fuzzy
 msgid "_Traffic"
 msgstr "Dữ liệu gửi đến"
 
-#: contrib/gnunet_statistics_gtk_main_window.glade:122
+#: contrib/gnunet_statistics_gtk_main_window.glade:120
 msgid "_Storage"
 msgstr ""
 
+#, fuzzy
+#~ msgid "<b>Editing zone %s</b>"
+#~ msgstr "<b>Bài xuất bản</b>"
+
+#, fuzzy
+#~ msgid "Attempting fully-automatic, non-interactive network configuration\n"
+#~ msgstr "Khởi chạy t_rợ lý cấu hình"
+
+#, fuzzy
+#~ msgid "attempt automatic configuration of the network and instantly exit"
+#~ msgstr "Khởi chạy t_rợ lý cấu hình"
+
+#, fuzzy
+#~ msgid "Attempt automatic configuration"
+#~ msgstr "Khởi chạy t_rợ lý cấu hình"
+
+#, fuzzy
+#~ msgid "<b>NAT Traversal Configuration</b>"
+#~ msgstr "<b>Cấu hình Trình nền GNUnet</b>"
+
 #~ msgid "Internal error"
 #~ msgstr "Lỗi nội bộ"
 
@@ -4151,10 +4922,6 @@ msgstr ""
 #~ msgid "_Options"
 #~ msgstr "Th_ao tác"
 
-#, fuzzy
-#~ msgid "<b>Domain Owner Information</b>"
-#~ msgstr "<b>Cấu hình Trình nền GNUnet</b>"
-
 #~ msgid "Country"
 #~ msgstr "Quốc gia"
 
@@ -4246,9 +5013,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "Mạng đồng đẳng của GNU"
 
-#~ msgid "Identity"
-#~ msgstr "Nhận diện"
-
 #~ msgid "anonymous"
 #~ msgstr "nặc danh"
 
@@ -4264,9 +5028,6 @@ msgstr ""
 #~ msgid "Choose the file you want to publish."
 #~ msgstr "Chọn tập tin bạn muốn xuất bản."
 
-#~ msgid "Choose the directory you want to publish."
-#~ msgstr "Chọn thư mục bạn muốn xuất bản."
-
 #~ msgid "Title"
 #~ msgstr "Tựa đề"
 
@@ -4373,9 +5134,6 @@ msgstr ""
 #~ msgid "Should the namespace `%s' really be deleted?"
 #~ msgstr "Thực sự nên xoá miền tên « %s » không?"
 
-#~ msgid "Downloading `%s'\n"
-#~ msgstr "Đang tải xuống « %s »\n"
-
 #~ msgid "ERROR: already downloading `%s'"
 #~ msgstr "LỖI: đã bắt đầu tải xuống « %s » trước"
 
@@ -4419,9 +5177,6 @@ msgstr ""
 #~ msgid "GNUnet - Connected to %Lu peers"
 #~ msgstr "GNUnet — có kết nối tới %Lu đồng đẳng"
 
-#~ msgid "<b>Disconnected</b>"
-#~ msgstr "<b>Bị ngắt kết nối</b>"
-
 #~ msgid "GNUnet - Disconnected"
 #~ msgstr "GNUnet — Bị ngắt kết nối"
 
@@ -4765,9 +5520,6 @@ msgstr ""
 #~ msgid "end collection (will not delete content already in the collection)"
 #~ msgstr "dừng thu thập (sẽ không xoá nội dung đã có trong bộ sưu tập)"
 
-#~ msgid "<b>Available content</b>"
-#~ msgstr "<b>Nội dung có</b>"
-
 #~ msgid ""
 #~ "Should GNUnet track available content (for publishing in namespaces)?"
 #~ msgstr ""
@@ -4792,9 +5544,6 @@ msgstr ""
 #~ msgid "Cha_t"
 #~ msgstr "Chá_t"
 
-#~ msgid "_Logs"
-#~ msgstr "Th_eo dõi"
-
 #~ msgid "Edit File Information"
 #~ msgstr "Sửa thông tin tập tin"
 
@@ -4854,9 +5603,6 @@ msgstr ""
 #~ msgid "Lists all of the keywords that will be used."
 #~ msgstr "Liệt kê tất cả các từ khóa sẽ dùng."
 
-#~ msgid "Select Preview"
-#~ msgstr "Chọn ô xem thử"
-
 #~ msgid "Cancel the publication."
 #~ msgstr "Thôi xuất bản."
 
@@ -4925,9 +5671,6 @@ msgstr ""
 #~ msgid "Resume the search"
 #~ msgstr "Tiếp tục lại tìm kiếm"
 
-#~ msgid "_Resume"
-#~ msgstr "Tiế_p tục"
-
 #~ msgid "Close search tab (also aborts search)"
 #~ msgstr "Đóng thẻ tìm kiếm (cũng hủy bỏ tìm kiếm)"
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] [gnunet-gtk] branch master updated: update pot files, gnunet <=
Prev by Date: [GNUnet-SVN] [gnunet-fuse] 01/02: fix ftbfs
Next by Date: [GNUnet-SVN] [gnunet] 01/02: changes for AGPL handling
Previous by thread: [GNUnet-SVN] [gnunet-fuse] branch master updated (3503aef -> eeb1cfa)
Next by thread: [GNUnet-SVN] [gnunet] branch master updated (e13828526 -> 6ab858be6)
Index(es):
- Date
- Thread