-pogen

8 files changed, 5100 insertions, 3092 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7722f481..55753c26 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,10 +17,8 @@ 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/gns/gnunet-gns-gtk_about.c
-src/gns/gnunet-gns-gtk.c
-src/gns/gnunet-gns-gtk_zone.c
 src/lib/about.c
+src/lib/animations.c
 src/lib/eventloop.c
 src/lib/glade.c
 src/lib/nls.c
@@ -34,8 +32,12 @@ src/setup/gnunet-setup-datacache-config.c
 src/setup/gnunet-setup-datacache-plugins.c
 src/setup/gnunet-setup-datastore-config.c
 src/setup/gnunet-setup-datastore-plugins.c
+src/setup/gnunet-setup-dns-exit.c
+src/setup/gnunet-setup-gns.c
 src/setup/gnunet-setup-hostlist-editing.c
 src/setup/gnunet-setup-hostlist-server.c
+src/setup/gnunet-setup-namestore-config.c
+src/setup/gnunet-setup-namestore-plugins.c
 src/setup/gnunet-setup-options.c
 src/setup/gnunet-setup-transport.c
 src/setup/gnunet-setup-transport-http.c
@@ -66,16 +68,16 @@ contrib/gnunet_fs_gtk_publish_tab.glade
 contrib/gnunet_fs_gtk_search_tab.glade
 contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
 contrib/gnunet_fs_gtk_unindex.glade
-contrib/gnunet_gns_gtk_about_window.glade
-contrib/gnunet_gns_gtk_main_window.glade
-contrib/gnunet_gns_gtk_zone_open.glade
 contrib/gnunet_gtk_status_bar_menu.glade
 contrib/gnunet_peerinfo_gtk_about_dialog.glade
 contrib/gnunet_peerinfo_gtk_about_window.glade
 contrib/gnunet_peerinfo_gtk_main_window.glade
 contrib/gnunet_setup_about_dialog.glade
 contrib/gnunet_setup_about_window.glade
+contrib/gnunet_setup_calendar_dialog.glade
+contrib/gnunet_setup_gns_edit_a.glade
 contrib/gnunet_setup_gtk_main_window.glade
+contrib/gnunet_setup_qr_save_as_dialog.glade
 contrib/gnunet_statistics_gtk_about_dialog.glade
 contrib/gnunet_statistics_gtk_about_window.glade
 contrib/gnunet_statistics_gtk_main_window.glade
diff --git a/po/da.po b/po/da.po
index 5aab58b5..4b4e7615 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,11 +10,12 @@
 # peer -> modpart
 # upload -> overføre
 #
+#: src/setup/gnunet-setup-gns.c:1745
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: 2010-02-28 12:25+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -23,8 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -46,42 +46,42 @@ msgstr ""
 msgid "no description supplied"
 msgstr "Samling stoppede.\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 #, fuzzy
 msgid "_Download"
 msgstr "H_ent"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 #, fuzzy
 msgid "Download _recursively"
 msgstr "r_ekursivt"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 #, fuzzy
 msgid "Download _as..."
 msgstr "H_ent"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 #, fuzzy
 msgid "_Abort download"
 msgstr "H_ent"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr "_Kopier URI til udklipsholderen"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Udgi_v"
@@ -123,121 +123,191 @@ msgstr "Vælg alle filer"
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, 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:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 msgid "<unnamed>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr "Fejl under tilgang til fil »%s«."
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
+#: 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/glade.c:118
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/lib/os_installation.c:284
 #, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
+#, c-format
+msgid "Failed to initialize communication with peerinfo service!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
+#, c-format
+msgid "Invalid regular expression `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:281
+#: src/setup/gnunet-setup.c:208
 #, fuzzy, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
-msgstr "Ændr navnet på konfigurationsfilen"
+msgid "Failed to obtain option value from widget `%s'\n"
+msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
 
-#: src/gns/gnunet-gns-gtk.c:286
+#: src/setup/gnunet-setup.c:257
 #, fuzzy, c-format
-msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
-msgstr "Ændr navnet på konfigurationsfilen"
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
+#: src/setup/gnunet-setup.c:268
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:499
+#: src/setup/gnunet-setup.c:278
 #, c-format
-msgid "Option `%s' missing in section `%s'\n"
+msgid "Failed to initialize widget `%s' with value `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:524
+#: src/setup/gnunet-setup.c:603
 #, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Kunne ikke indsætte indhold i navnerum (se logfiler).\n"
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
+msgstr "Start konfigurationsgu_iden"
 
-#: src/gns/gnunet-gns-gtk.c:555
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<n>Udgivelser</b>"
+#: src/setup/gnunet-setup.c:624
+#, fuzzy
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr "Start konfigurationsgu_iden"
 
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:287
-#, c-format
+#: src/setup/gnunet-setup.c:631
 msgid ""
-"%s\n"
-"%s\n"
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
 msgstr ""
 
-#: src/lib/glade.c:118
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
+#, c-format
+msgid "`%s' is not a valid port number!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:684
+#, fuzzy
+msgid "Specification of .gnunet TLD"
+msgstr "Angiv her placeringen af »gnunetd.conf«"
+
+#: src/setup/gnunet-setup-gns.c:35
+msgid "<new name>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+#, fuzzy
+msgid "Failed to initialize QR-code pixbuf"
 msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/lib/os_installation.c:284
+#: src/setup/gnunet-setup-gns.c:424
 #, c-format
 msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+"%s\n"
+"%s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
-#, c-format
-msgid "Failed to initialize communication with peerinfo service!\n"
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+msgid "Failed to remove record"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
-#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#: src/setup/gnunet-setup-gns.c:610
+msgid "Invalid pseudonym specified for zone"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
 #, c-format
-msgid "Widget `%s' not found\n"
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
 #, c-format
-msgid "Invalid regular expression `%s'\n"
+msgid "New Pseudonym could not be set: `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:170
-#, 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-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+#, fuzzy
+msgid "Failed to load zone"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
 
-#: src/setup/gnunet-setup.c:219
+#: src/setup/gnunet-setup-gns.c:1902
 #, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Kunne ikke finde håndtering for »%s«\n"
+msgid "<b>Editing zone %s</b>"
+msgstr "<n>Udgivelser</b>"
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup-gns.c:1958
 #, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
+msgid "Option `%s' missing in section `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:240
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
 msgstr ""
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2041
+#, fuzzy
+msgid "<b><big>Failed to connect to namestore</b></big>"
+msgstr "Kunne ikke indsætte indhold i navnerum (se logfiler).\n"
+
+#: src/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -274,309 +344,358 @@ msgstr ""
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 #, fuzzy
 msgid "Configuration file for MySQL access"
 msgstr "_Konfigurationsfil anvendt for gnunetd:"
 
-#: src/setup/gnunet-setup-options.c:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 #, fuzzy
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "_Konfigurationsfil anvendt for gnunetd:"
 
-#: src/setup/gnunet-setup-options.c:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-#, fuzzy
-msgid "Specification of .gnunet TLD"
-msgstr "Angiv her placeringen af »gnunetd.conf«"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
 
 #: src/statistics/functions.c:519
 msgid "Connectivity"
@@ -651,7 +770,6 @@ msgid "Connected to %Lu peers"
 msgstr "Forbundet til %Lu modparter"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -659,7 +777,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -667,7 +784,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -675,7 +791,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -683,7 +798,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -692,7 +806,6 @@ msgid "Credits"
 msgstr "Vis bidragydere"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -700,7 +813,6 @@ msgid "License"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -900,7 +1012,6 @@ msgid "Search"
 msgstr "S_øg"
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 msgid "_Help"
@@ -1099,6 +1210,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 #, fuzzy
 msgid "_Cancel"
 msgstr "A_vanceret"
@@ -1129,17 +1254,22 @@ msgstr "Udgivet filnavn"
 msgid "Index file"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 #, fuzzy
 msgid "Progress"
 msgstr "Fremgang"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+msgid "Status"
+msgstr "Status"
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 #, fuzzy
 msgid "Publishing"
 msgstr "Udgi_v"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1147,79 +1277,16 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 #, fuzzy
 msgid "Indexed files"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "Inde_ks"
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-#, fuzzy
-msgid "gnunet-gns-gtk"
-msgstr "Om gnunet-gtk"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-msgid "Delete Record"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-#, fuzzy
-msgid "_File"
-msgstr "Filnavn"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-#, fuzzy
-msgid "_Options"
-msgstr "Ope_rationer"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-msgid "Automatically shorten names"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
@@ -1865,50 +1932,207 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "<b>Metadata</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Kørende programmer</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+#, fuzzy
+msgid "Minutes:"
+msgstr "minutter"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+#, fuzzy
+msgid "Seconds:"
+msgstr "sekunder"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<n>Udgivelser</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Filde_ling"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -1917,11 +2141,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -1932,119 +2156,119 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 #, fuzzy
 msgid "F_2F only"
 msgstr "K_un fil"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 #, fuzzy
 msgid "Friends file:"
 msgstr "Inde_ks"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 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_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr "_Generelt"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 #, fuzzy
 msgid "<b>Bandwidth Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 #, fuzzy
 msgid "Attempt automatic configuration"
 msgstr "Start konfigurationsgu_iden"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -2053,26 +2277,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -2080,301 +2304,311 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 msgid "External (public) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 #, fuzzy
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 #, fuzzy
 msgid "Test configuration"
 msgstr "_Avanceret konfiguration"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Kørende programmer</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 #, fuzzy
 msgid "Postgres"
 msgstr "Fremgang"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 #, fuzzy
 msgid "gnunet"
 msgstr "Om gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 #, fuzzy
 msgid "Configuration file:"
 msgstr "_Konfigurationsfil anvendt for gnunetd:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 #, fuzzy
 msgid "Username:"
 msgstr "_Filnavn:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 #, fuzzy
 msgid "Configuration:"
 msgstr "_Avanceret konfiguration"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Filde_ling"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -2382,11 +2616,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2394,12 +2628,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Indgående trafik"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2410,147 +2644,198 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 msgid "IPv4 address for interface:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 msgid "IPv6 address for interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 #, fuzzy
 msgid "<b>VPN Interface Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+#, fuzzy
+msgid "N_amestore"
+msgstr "_Navnerum"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
 #, fuzzy
-msgid "<b>Domain Owner Information</b>"
-msgstr "<n>GNUnet dæmonkonfiguration</b>"
+msgid "QR code for the selected zone"
+msgstr "Luk den valgte søgning"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+msgid "Delete GNS entry"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+#, fuzzy
+msgid "Delete"
+msgstr "gtk-slet"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+#, fuzzy
+msgid "1 day"
+msgstr "dag"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-statistics-gtk"
@@ -2580,6 +2865,33 @@ msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten could not be written to configuration file: `%s'\n"
+#~ msgstr "Ændr navnet på konfigurationsfilen"
+
+#, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten option could not be written to configuration file: "
+#~ "`%s'\n"
+#~ msgstr "Ændr navnet på konfigurationsfilen"
+
+#, fuzzy
+#~ msgid "gnunet-gns-gtk"
+#~ msgstr "Om gnunet-gtk"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "Filnavn"
+
+#, fuzzy
+#~ msgid "_Options"
+#~ msgstr "Ope_rationer"
+
+#, fuzzy
+#~ msgid "<b>Domain Owner Information</b>"
+#~ msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#, fuzzy
 #~ msgid "Peer"
 #~ msgstr "_Modparter"
 
@@ -2692,10 +3004,6 @@ msgstr ""
 #~ msgstr "_Statistik"
 
 #, fuzzy
-#~ msgid "1 day"
-#~ msgstr "dag"
-
-#, fuzzy
 #~ msgid "1 hour"
 #~ msgstr "time"
 
@@ -2717,9 +3025,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "GNU's modpartsnetværk"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Identity"
 #~ msgstr "Identitet"
 
@@ -2790,12 +3095,6 @@ msgstr ""
 #~ msgid "ms"
 #~ msgstr "ms"
 
-#~ msgid "minutes"
-#~ msgstr "minutter"
-
-#~ msgid "seconds"
-#~ msgstr "sekunder"
-
 #~ msgid "days"
 #~ msgstr "dage"
 
@@ -3292,9 +3591,6 @@ msgstr ""
 #~ msgid "gtk-new"
 #~ msgstr "gtk-ny"
 
-#~ msgid "gtk-delete"
-#~ msgstr "gtk-slet"
-
 #~ msgid ""
 #~ "Will prevent future insertions into the namespace (will not delete "
 #~ "content in the namespace)"
@@ -3591,9 +3887,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Bekræft de angivne data. Opretter navnerummet og udgiver reklamerne."
 
-#~ msgid "Close the selected search"
-#~ msgstr "Luk den valgte søgning"
-
 #~ msgid "_Close"
 #~ msgstr "_Luk"
 
diff --git a/po/de.po b/po/de.po
index 9b1ba510..4de8a16c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,11 +4,12 @@
 # This file is distributed under the same license as the GNUnet package.
 # Christian Grothoff <christian@grothoff.org>, 2004, 2005.
 #
+#: src/setup/gnunet-setup-gns.c:1745
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: 2006-03-17 21:18+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,8 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -41,43 +41,43 @@ msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 msgid "no description supplied"
 msgstr "Keine Kommandos angegeben.\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 #, fuzzy
 msgid "_Download"
 msgstr "Downl_oad"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 #, fuzzy
 msgid "Download _recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 #, fuzzy
 msgid "Download _as..."
 msgstr "Downl_oad"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 #, fuzzy
 msgid "_Abort download"
 msgstr "Downl_oad"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 #, fuzzy
 msgid "Error!"
 msgstr "Fehler"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Anwendung"
@@ -121,75 +121,25 @@ msgstr "Alle Dateien auswählen"
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, fuzzy, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 #, fuzzy
 msgid "<unnamed>"
 msgstr "unbenannt"
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
-#, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:281
-#, fuzzy, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#: src/gns/gnunet-gns-gtk.c:286
-#, fuzzy, c-format
-msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:499
+#: src/lib/animations.c:146
 #, fuzzy, c-format
-msgid "Option `%s' missing in section `%s'\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:524
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/gns/gnunet-gns-gtk.c:555
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Laufende Anwendungen</b>"
-
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk_zone.c:287
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"%s\n"
-msgstr ""
-"Verwendung: %s\n"
-"%s\n"
-"\n"
+msgid "Failed to load animation from file `%s'\n"
+msgstr "Handler für `%s' konnte nicht gefunden werden\n"
 
 #: src/lib/glade.c:118
 #, fuzzy, c-format
@@ -203,45 +153,167 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
 #, fuzzy, c-format
 msgid "Failed to initialize communication with peerinfo service!\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
 #: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
 #, fuzzy, c-format
 msgid "Widget `%s' not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
 #, fuzzy, c-format
 msgid "Invalid regular expression `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/setup/gnunet-setup.c:170
+#: src/setup/gnunet-setup.c:208
 #, fuzzy, c-format
 msgid "Failed to obtain option value from widget `%s'\n"
 msgstr "Handler für `%s' konnte nicht gefunden werden\n"
 
-#: src/setup/gnunet-setup.c:219
+#: src/setup/gnunet-setup.c:257
 #, fuzzy, c-format
 msgid "Failed to initialize widget `%s'\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup.c:268
 #, fuzzy, c-format
 msgid "No default value known for option `%s' in section `%s'\n"
 msgstr ""
 "Sie sollten mindestens einen Transport Dienst unter der Option `%s' in der "
 "Sektion `%s' angegeben.\n"
 
-#: src/setup/gnunet-setup.c:240
+#: src/setup/gnunet-setup.c:278
 #, fuzzy, c-format
 msgid "Failed to initialize widget `%s' with value `%s'\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:603
+#, fuzzy
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: src/setup/gnunet-setup.c:624
+#, fuzzy
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:631
+msgid ""
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
+#, fuzzy, c-format
+msgid "`%s' is not a valid port number!\n"
+msgstr "`%s' ist keine normale Datei.\n"
+
+#: src/setup/gnunet-setup-dns-exit.c:684
+msgid "Specification of .gnunet TLD"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:35
+#, fuzzy
+msgid "<new name>"
+msgstr "unbenannt"
+
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+#, fuzzy
+msgid "Failed to initialize QR-code pixbuf"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/setup/gnunet-setup-gns.c:424
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"%s\n"
+msgstr ""
+"Verwendung: %s\n"
+"%s\n"
+"\n"
+
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+#, fuzzy
+msgid "Failed to remove record"
+msgstr "Hostkey konnte nicht erzeugt werden!\n"
+
+#: src/setup/gnunet-setup-gns.c:610
+#, fuzzy
+msgid "Invalid pseudonym specified for zone"
+msgstr "Ungültiger LOGLEVEL `%s' angegeben.\n"
+
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
+#, c-format
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
+#, c-format
+msgid "New Pseudonym could not be set: `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+#, fuzzy
+msgid "Failed to load zone"
+msgstr "Fehler beim Laden des Moduls `%s'\n"
+
+#: src/setup/gnunet-setup-gns.c:1902
+#, fuzzy, c-format
+msgid "<b>Editing zone %s</b>"
+msgstr "<b>Laufende Anwendungen</b>"
+
+#: src/setup/gnunet-setup-gns.c:1958
+#, fuzzy, c-format
+msgid "Option `%s' missing in section `%s'\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2041
+#, fuzzy
+msgid "<b><big>Failed to connect to namestore</b></big>"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -278,309 +350,361 @@ msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, fuzzy, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr "`%s' ist keine normale Datei.\n"
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 #, fuzzy
 msgid "IPv4 address to use for the Exit interface"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 #, fuzzy
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 #, fuzzy
 msgid "IPv6 address to use for the Exit interface"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 #, fuzzy
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-msgid "Specification of .gnunet TLD"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, fuzzy, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Ungültiger RPC `%s' empfangen.\n"
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+"Verbindung von Adresse %s wird abgewiesen, Sender steht auf schwarzer "
+"Liste.\n"
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
 #: src/statistics/functions.c:519
@@ -651,7 +775,6 @@ msgid "Connected to %Lu peers"
 msgstr "Verbindung zu gnunetd hergestellt.\n"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -659,7 +782,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -667,7 +789,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -675,7 +796,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -683,7 +803,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -692,7 +811,6 @@ msgid "Credits"
 msgstr "Credits anzeigen"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -701,7 +819,6 @@ msgid "License"
 msgstr "_Lizenz"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -897,7 +1014,6 @@ msgid "Search"
 msgstr "Suche"
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 #, fuzzy
@@ -1096,6 +1212,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 #, fuzzy
 msgid "_Cancel"
 msgstr "Abbrechen"
@@ -1125,16 +1255,22 @@ msgstr "Publizierter Dateiname"
 msgid "Index file"
 msgstr "Dateien deindizieren."
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+#, fuzzy
+msgid "Status"
+msgstr "Stat_us"
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 #, fuzzy
 msgid "Publishing"
 msgstr "Anwendung"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1142,80 +1278,16 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 #, fuzzy
 msgid "Indexed files"
 msgstr "Dateien deindizieren."
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "Dateien deindizieren."
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-#, fuzzy
-msgid "gnunet-gns-gtk"
-msgstr "gnunet-gtk"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-#, fuzzy
-msgid "Delete Record"
-msgstr "Lösch_en"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-#, fuzzy
-msgid "_File"
-msgstr "_Datei"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-#, fuzzy
-msgid "_Options"
-msgstr "Konnektivität"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-msgid "Automatically shorten names"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
@@ -1575,50 +1647,206 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "Nachrichten"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Uploads</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+msgid "Minutes:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+#, fuzzy
+msgid "Seconds:"
+msgstr "Laufzeit (Sekunden)"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Laufende Anwendungen</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Datentausc_h"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -1627,11 +1855,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -1642,118 +1870,118 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 #, fuzzy
 msgid "Friends file:"
 msgstr "Dateien deindizieren."
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 #, fuzzy
 msgid "Min. connected friends:"
 msgstr "# an verbundenen Knoten"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr "All_gemeines"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 #, fuzzy
 msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 #, fuzzy
 msgid "Attempt automatic configuration"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -1762,26 +1990,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -1789,303 +2017,313 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 #, fuzzy
 msgid "External (public) IPv4 address:"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 #, fuzzy
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 #, fuzzy
 msgid "Test configuration"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 #, fuzzy
 msgid "Test failed!"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Laufende Anwendungen</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 #, fuzzy
 msgid "Database Backend to use:"
 msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 #, fuzzy
 msgid "Quota (bytes):"
 msgstr "Downstream (Bytes/s):"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 #, fuzzy
 msgid "gnunet"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 #, fuzzy
 msgid "Username:"
 msgstr "_Dateiname:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 msgid "Configuration:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Datentausc_h"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -2093,11 +2331,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2105,12 +2343,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Eingehender Netzwerkverkehr"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2121,152 +2359,203 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 #, fuzzy
 msgid "IPv4 address for interface:"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 #, fuzzy
 msgid "IPv6 address for interface: "
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 #, fuzzy
 msgid "<b>VPN Interface Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 #, fuzzy
 msgid "IPv4 address for Exit interface: "
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 #, fuzzy
 msgid "IPv6 address for Exit interface: "
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+#, fuzzy
+msgid "N_amestore"
+msgstr "_Namensraum"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
 #, fuzzy
-msgid "<b>Domain Owner Information</b>"
-msgstr "<b>GNUnet Konfiguration</b>"
+msgid "QR code for the selected zone"
+msgstr "Die ausgewählte Suche schließen."
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 #, fuzzy
 msgid "Welcome to gnunet-setup."
 msgstr "Vorlage für gnunet-clients."
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+#, fuzzy
+msgid "Delete GNS entry"
+msgstr "Lösch_en"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+#, fuzzy
+msgid "Delete"
+msgstr "Lösch_en"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+msgid "1 day"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-statistics-gtk"
@@ -2296,6 +2585,33 @@ msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten could not be written to configuration file: `%s'\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten option could not be written to configuration file: "
+#~ "`%s'\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "gnunet-gns-gtk"
+#~ msgstr "gnunet-gtk"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "_Datei"
+
+#, fuzzy
+#~ msgid "_Options"
+#~ msgstr "Konnektivität"
+
+#, fuzzy
+#~ msgid "<b>Domain Owner Information</b>"
+#~ msgstr "<b>GNUnet Konfiguration</b>"
+
+#, fuzzy
 #~ msgid "Peer"
 #~ msgstr "nie"
 
@@ -2500,10 +2816,6 @@ msgstr ""
 #~ msgstr "Ergebnisse"
 
 #, fuzzy
-#~ msgid "seconds"
-#~ msgstr "Laufzeit (Sekunden)"
-
-#, fuzzy
 #~ msgid "second"
 #~ msgstr "Laufzeit (Sekunden)"
 
@@ -2604,10 +2916,6 @@ msgstr ""
 #~ msgstr "CPU Last (in Prozent der erlaubten Last)"
 
 #, fuzzy
-#~ msgid "Status"
-#~ msgstr "Stat_us"
-
-#, fuzzy
 #~ msgid "Identity"
 #~ msgstr "_Identifizierer:"
 
@@ -3115,9 +3423,6 @@ msgstr ""
 #~ msgid "<b>Metadata</b>"
 #~ msgstr "<b>Metainformationen</b>"
 
-#~ msgid "Close the selected search"
-#~ msgstr "Die ausgewählte Suche schließen."
-
 #~ msgid "_Close"
 #~ msgstr "S_chliessen"
 
@@ -3275,9 +3580,6 @@ msgstr ""
 #~ msgid "Use --help to get a list of options.\n"
 #~ msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#~ msgid "<b>Uploads</b>"
-#~ msgstr "<b>Uploads</b>"
-
 #~ msgid "Up_load"
 #~ msgstr "Hoch_laden"
 
@@ -3592,10 +3894,6 @@ msgstr ""
 #~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
 #, fuzzy
-#~ msgid "Failed to create NBlock!"
-#~ msgstr "Hostkey konnte nicht erzeugt werden!\n"
-
-#, fuzzy
 #~ msgid "Create advertisement"
 #~ msgstr "# Knotenankündigungen empfangen"
 
@@ -4121,10 +4419,6 @@ msgstr ""
 #~ "Bezeichner angeben.\n"
 
 #, fuzzy
-#~ msgid "Invalid URI specified!\n"
-#~ msgstr "Ungültiger LOGLEVEL `%s' angegeben.\n"
-
-#, fuzzy
 #~ msgid "Invalid namespace identifier `%s' specified.\n"
 #~ msgstr "Ungültiger LOGLEVEL `%s' angegeben.\n"
 
@@ -4658,9 +4952,6 @@ msgstr ""
 #~ msgid "Malformed response to `%s' on master table.\n"
 #~ msgstr "Beschädigte Antwort auf `%s' in Master Tabelle.\n"
 
-#~ msgid "Received invalid RPC `%s'.\n"
-#~ msgstr "Ungültiger RPC `%s' empfangen.\n"
-
 #~ msgid "allow SIZE bytes of memory for the local table"
 #~ msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
 
@@ -5259,11 +5550,6 @@ msgstr ""
 #~ "über die TCP6-Verbindung zu einem anderen Knoten wurde eine ungültige "
 #~ "Nachricht empfangen. Verbindung wird geschlossen.\n"
 
-#~ msgid "Rejected blacklisted connection from address %s.\n"
-#~ msgstr ""
-#~ "Verbindung von Adresse %s wird abgewiesen, Sender steht auf schwarzer "
-#~ "Liste.\n"
-
 #~ msgid "`%s': unknown service: %s\n"
 #~ msgstr "`%s': unbekannter Dienst: %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index 0fa251eb..6cc17132 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,11 +4,12 @@
 # This file is distributed under the same license as the gnunet-gtk package.
 #
 # Milan Bouchet-Valat <nalimilan@club.fr>, 2008, 2009.
+#: src/setup/gnunet-setup-gns.c:1745
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: 2009-12-29 22:49+0100\n"
 "Last-Translator: Milan Bouchet-Valat <nalimilan@club.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -17,8 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -40,42 +40,42 @@ msgstr ""
 msgid "no description supplied"
 msgstr "Collection arrêtée.\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 #, fuzzy
 msgid "_Download"
 msgstr "Téléchar_ger"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 #, fuzzy
 msgid "Download _recursively"
 msgstr "récursiv_ement"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 #, fuzzy
 msgid "Download _as..."
 msgstr "Téléchar_ger"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 #, fuzzy
 msgid "_Abort download"
 msgstr "Téléchar_ger"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr "_Copier l'URI dans le presse-papiers"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Pub_lier"
@@ -117,73 +117,26 @@ msgstr "Sélectionner tous les fichiers"
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, 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:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 msgid "<unnamed>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr "Erreur d'accès au fichier « %s »."
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
-#, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:281
+#: src/lib/animations.c:146
 #, fuzzy, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
-msgstr "Changer le nom du fichier de configuration"
-
-#: src/gns/gnunet-gns-gtk.c:286
-#, fuzzy, c-format
-msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
-msgstr "Changer le nom du fichier de configuration"
-
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:499
-#, c-format
-msgid "Option `%s' missing in section `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk.c:524
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr ""
-"Impossible de publier du contenu dans l'espace de noms (consultez les "
-"journaux d'erreur).\n"
-
-#: src/gns/gnunet-gns-gtk.c:555
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Publications</b>"
-
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
-msgstr ""
-
-#: src/gns/gnunet-gns-gtk_zone.c:287
-#, c-format
-msgid ""
-"%s\n"
-"%s\n"
+msgid "Failed to load animation from file `%s'\n"
 msgstr ""
+"ATTENTION : Impossible d'obtenir de gnunetd les statistiques concernant la "
+"connexion.\n"
 
 #: src/lib/glade.c:118
 #, fuzzy, c-format
@@ -197,45 +150,164 @@ msgid ""
 "variable.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
 #, c-format
 msgid "Failed to initialize communication with peerinfo service!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
 #: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
 #, c-format
 msgid "Widget `%s' not found\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
 #, c-format
 msgid "Invalid regular expression `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:170
+#: src/setup/gnunet-setup.c:208
 #, 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:219
+#: src/setup/gnunet-setup.c:257
 #, fuzzy, c-format
 msgid "Failed to initialize widget `%s'\n"
 msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup.c:268
 #, c-format
 msgid "No default value known for option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:240
+#: src/setup/gnunet-setup.c:278
 #, c-format
 msgid "Failed to initialize widget `%s' with value `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:603
+#, fuzzy
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
+msgstr "_Lancer l'assistant de configuration"
+
+#: src/setup/gnunet-setup.c:624
+#, fuzzy
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr "_Lancer l'assistant de configuration"
+
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:631
+msgid ""
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
+#, c-format
+msgid "`%s' is not a valid port number!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:684
+#, fuzzy
+msgid "Specification of .gnunet TLD"
+msgstr "Spécifiez ici l'emplacement de « gnunetd.conf »"
+
+#: src/setup/gnunet-setup-gns.c:35
+msgid "<new name>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
+msgstr "jamais"
+
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+#, fuzzy
+msgid "Failed to initialize QR-code pixbuf"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/setup/gnunet-setup-gns.c:424
+#, c-format
+msgid ""
+"%s\n"
+"%s\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+msgid "Failed to remove record"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:610
+msgid "Invalid pseudonym specified for zone"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
+#, c-format
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
+#, c-format
+msgid "New Pseudonym could not be set: `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+#, fuzzy
+msgid "Failed to load zone"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/setup/gnunet-setup-gns.c:1902
+#, fuzzy, c-format
+msgid "<b>Editing zone %s</b>"
+msgstr "<b>Publications</b>"
+
+#: src/setup/gnunet-setup-gns.c:1958
+#, c-format
+msgid "Option `%s' missing in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2041
+#, 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/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -272,309 +344,358 @@ msgstr ""
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 #, fuzzy
 msgid "Configuration file for MySQL access"
 msgstr "Fichier de _configuration à utiliser pour gnunetd :"
 
-#: src/setup/gnunet-setup-options.c:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 #, fuzzy
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr "Fichier de _configuration à utiliser pour gnunetd :"
 
-#: src/setup/gnunet-setup-options.c:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-#, fuzzy
-msgid "Specification of .gnunet TLD"
-msgstr "Spécifiez ici l'emplacement de « gnunetd.conf »"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
 
 #: src/statistics/functions.c:519
 msgid "Connectivity"
@@ -647,7 +768,6 @@ msgid "Connected to %Lu peers"
 msgstr "Connecté à %Lu pairs"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -655,7 +775,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -663,7 +782,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -671,7 +789,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -679,7 +796,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -688,7 +804,6 @@ msgid "Credits"
 msgstr "Afficher les crédits"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -696,7 +811,6 @@ msgid "License"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -896,7 +1010,6 @@ msgid "Search"
 msgstr "R_echercher"
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 msgid "_Help"
@@ -1095,6 +1208,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 #, fuzzy
 msgid "_Cancel"
 msgstr "A_vancé"
@@ -1125,17 +1252,22 @@ msgstr "Nom de publication du fichier"
 msgid "Index file"
 msgstr "inde_xer"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 #, fuzzy
 msgid "Progress"
 msgstr "Avancement"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+msgid "Status"
+msgstr "État"
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 #, fuzzy
 msgid "Publishing"
 msgstr "Pub_lier"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1143,79 +1275,16 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 #, fuzzy
 msgid "Indexed files"
 msgstr "inde_xer"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "inde_xer"
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-#, fuzzy
-msgid "gnunet-gns-gtk"
-msgstr "À propos de gnunet-gtk"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-msgid "Delete Record"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-#, fuzzy
-msgid "_File"
-msgstr "Nom du fichier"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-#, fuzzy
-msgid "_Options"
-msgstr "Opé_rations"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-msgid "Automatically shorten names"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
@@ -1860,50 +1929,208 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "Messages"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Applications lancées</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+#, fuzzy
+msgid "Never"
+msgstr "jamais"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+#, fuzzy
+msgid "Minutes:"
+msgstr "minutes"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+#, fuzzy
+msgid "Seconds:"
+msgstr "secondes"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Publications</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Partage de fic_hiers"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -1912,11 +2139,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -1927,118 +2154,118 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 #, fuzzy
 msgid "F_2F only"
 msgstr "un _seul fichier"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 #, fuzzy
 msgid "Friends file:"
 msgstr "inde_xer"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr "_Général"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 #, fuzzy
 msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 #, fuzzy
 msgid "Attempt automatic configuration"
 msgstr "_Lancer l'assistant de configuration"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -2047,26 +2274,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -2074,301 +2301,311 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 msgid "External (public) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 #, fuzzy
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 #, fuzzy
 msgid "Test configuration"
 msgstr "Configuration _avancée"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Applications lancées</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 #, fuzzy
 msgid "Postgres"
 msgstr "Avancement"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 #, fuzzy
 msgid "gnunet"
 msgstr "À propos de gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Fichier de _configuration à utiliser pour gnunetd :"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 #, fuzzy
 msgid "Username:"
 msgstr "Nom du _fichier :"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 #, fuzzy
 msgid "Configuration:"
 msgstr "Configuration _avancée"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Partage de fic_hiers"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -2376,11 +2613,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2388,12 +2625,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Traffic entrant"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2404,147 +2641,198 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 msgid "IPv4 address for interface:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 msgid "IPv6 address for interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 #, fuzzy
 msgid "<b>VPN Interface Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Configuration du démon GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+#, fuzzy
+msgid "N_amestore"
+msgstr "Espace de _noms"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
 #, fuzzy
-msgid "<b>Domain Owner Information</b>"
-msgstr "<b>Configuration du démon GNUnet</b>"
+msgid "QR code for the selected zone"
+msgstr "Fermer la recherche sélectionnée"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+msgid "Delete GNS entry"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+#, fuzzy
+msgid "Delete"
+msgstr "gtk-delete"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+#, fuzzy
+msgid "1 day"
+msgstr "jour"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-statistics-gtk"
@@ -2574,6 +2862,33 @@ msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten could not be written to configuration file: `%s'\n"
+#~ msgstr "Changer le nom du fichier de configuration"
+
+#, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten option could not be written to configuration file: "
+#~ "`%s'\n"
+#~ msgstr "Changer le nom du fichier de configuration"
+
+#, fuzzy
+#~ msgid "gnunet-gns-gtk"
+#~ msgstr "À propos de gnunet-gtk"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "Nom du fichier"
+
+#, fuzzy
+#~ msgid "_Options"
+#~ msgstr "Opé_rations"
+
+#, fuzzy
+#~ msgid "<b>Domain Owner Information</b>"
+#~ msgstr "<b>Configuration du démon GNUnet</b>"
+
+#, fuzzy
 #~ msgid "Peer"
 #~ msgstr "_Pairs"
 
@@ -2692,10 +3007,6 @@ msgstr ""
 #~ msgstr "_Statistiques"
 
 #, fuzzy
-#~ msgid "1 day"
-#~ msgstr "jour"
-
-#, fuzzy
 #~ msgid "1 hour"
 #~ msgstr "heure"
 
@@ -2719,9 +3030,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "Le réseau pair-à-pair GNU"
 
-#~ msgid "Status"
-#~ msgstr "État"
-
 #~ msgid "Identity"
 #~ msgstr "Identité"
 
@@ -2794,12 +3102,6 @@ msgstr ""
 #~ msgid "ms"
 #~ msgstr "ms"
 
-#~ msgid "minutes"
-#~ msgstr "minutes"
-
-#~ msgid "seconds"
-#~ msgstr "secondes"
-
 #~ msgid "days"
 #~ msgstr "jours"
 
@@ -3318,9 +3620,6 @@ msgstr ""
 #~ msgid "gtk-new"
 #~ msgstr "gtk-new"
 
-#~ msgid "gtk-delete"
-#~ msgstr "gtk-delete"
-
 #~ msgid ""
 #~ "Will prevent future insertions into the namespace (will not delete "
 #~ "content in the namespace)"
@@ -3640,9 +3939,6 @@ msgstr ""
 #~ "Confirme les données spécifiées.  Crée l'espace de noms et publie les "
 #~ "annonces."
 
-#~ msgid "Close the selected search"
-#~ msgstr "Fermer la recherche sélectionnée"
-
 #~ msgid "_Close"
 #~ msgstr "_Fermer"
 
@@ -3775,9 +4071,6 @@ msgstr ""
 #~ "cause d'erreur la plus probable est qu'un espace de noms portant ce nom "
 #~ "existe déjà."
 
-#~ msgid "never"
-#~ msgstr "jamais"
-
 #~ msgid "Publication Frequency"
 #~ msgstr "Fréquence de publication"
 
diff --git a/po/gnunet-gtk.pot b/po/gnunet-gtk.pot
index 2634305a..e4d8861d 100644
--- a/po/gnunet-gtk.pot
+++ b/po/gnunet-gtk.pot
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/setup/gnunet-setup-gns.c:1745
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gnunet-gtk 0.9.3\n"
+"Project-Id-Version: gnunet-gtk r24715\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,8 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -39,37 +39,37 @@ msgstr ""
 msgid "no description supplied"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 msgid "_Download"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 msgid "Download _recursively"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 msgid "Download _as..."
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 msgid "_Abort download"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 msgid "no URI"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 msgid "_Abort publishing"
 msgstr ""
 
@@ -109,120 +109,185 @@ msgstr ""
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 msgid "<unnamed>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
+#: src/lib/animations.c:146
 #, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
+msgid "Failed to load animation from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:281
+#: src/lib/glade.c:118
 #, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
+msgid "Failed to load `%s': %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:286
+#: src/lib/os_installation.c:284
 #, c-format
 msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
+#, c-format
+msgid "Failed to initialize communication with peerinfo service!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:499
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
 #, c-format
-msgid "Option `%s' missing in section `%s'\n"
+msgid "Widget `%s' not found\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
+#, c-format
+msgid "Invalid regular expression `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:524
-msgid "Failed to connect to namestore\n"
+#: src/setup/gnunet-setup.c:208
+#, c-format
+msgid "Failed to obtain option value from widget `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:555
+#: src/setup/gnunet-setup.c:257
 #, c-format
-msgid "<b>Editing zone %s</b>"
+msgid "Failed to initialize widget `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
+#: src/setup/gnunet-setup.c:268
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:287
+#: src/setup/gnunet-setup.c:278
 #, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
 msgid ""
-"%s\n"
-"%s\n"
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
 msgstr ""
 
-#: src/lib/glade.c:118
-#, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/setup/gnunet-setup.c:603
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
 msgstr ""
 
-#: src/lib/os_installation.c:284
-#, c-format
+#: src/setup/gnunet-setup.c:624
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:631
 msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
 #, c-format
-msgid "Failed to initialize communication with peerinfo service!\n"
+msgid "Option `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
-#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
 #, c-format
-msgid "Widget `%s' not found\n"
+msgid "`%s' is not a valid port number!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:684
+msgid "Specification of .gnunet TLD"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:35
+msgid "<new name>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+msgid "Failed to initialize QR-code pixbuf"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:424
 #, c-format
-msgid "Invalid regular expression `%s'\n"
+msgid ""
+"%s\n"
+"%s\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:170
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+msgid "Failed to remove record"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:610
+msgid "Invalid pseudonym specified for zone"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
 #, c-format
-msgid "Failed to obtain option value from widget `%s'\n"
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:219
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
 #, c-format
-msgid "Failed to initialize widget `%s'\n"
+msgid "New Pseudonym could not be set: `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+msgid "Failed to load zone"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup-gns.c:1902
 #, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
+msgid "<b>Editing zone %s</b>"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:240
+#: src/setup/gnunet-setup-gns.c:1958
 #, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgid "Option `%s' missing in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
 msgstr ""
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup-gns.c:2041
+msgid "<b><big>Failed to connect to namestore</b></big>"
+msgstr ""
+
+#: src/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -259,305 +324,355 @@ msgstr ""
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-msgid "Specification of .gnunet TLD"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
 #: src/statistics/functions.c:519
@@ -626,7 +741,6 @@ msgid "Connected to %Lu peers"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -634,7 +748,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -642,7 +755,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -650,7 +762,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -658,7 +769,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -666,7 +776,6 @@ msgid "Credits"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -674,7 +783,6 @@ msgid "License"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -851,7 +959,6 @@ msgid "Search"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 msgid "_Help"
@@ -1039,6 +1146,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 msgid "_Cancel"
 msgstr ""
 
@@ -1064,15 +1185,20 @@ msgstr ""
 msgid "Index file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+msgid "Status"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 msgid "Publishing"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1080,74 +1206,14 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 msgid "Indexed files"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 msgid "Unindex the selected indexed file."
 msgstr ""
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-msgid "gnunet-gns-gtk"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-msgid "Delete Record"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-msgid "_File"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-msgid "_Options"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-msgid "Automatically shorten names"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 msgid "Quit"
 msgstr ""
@@ -1490,48 +1556,200 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+msgid "<b>Name</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+msgid "<b>Options</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+msgid "Minutes:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+msgid "Seconds:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+msgid "<b>Expiration Time</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 msgid "gnunet-setup"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 msgid "File _Sharing"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -1540,11 +1758,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -1555,113 +1773,113 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 msgid "<b>Service Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 msgid "Friends file:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 msgid "<b>Bandwidth Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 msgid "Attempt automatic configuration"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -1670,26 +1888,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -1697,291 +1915,301 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 msgid "External (public) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 msgid "Test configuration"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 msgid "<b>Transport Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 msgid "<b>File Sharing Options</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 msgid "gnunet"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 msgid "Configuration file:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 msgid "Username:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 msgid "Configuration:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 msgid "_File Sharing"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -1989,11 +2217,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2001,11 +2229,11 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 msgid "Tunnel DNS Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2016,143 +2244,191 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 msgid "IPv4 address for interface:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 msgid "IPv6 address for interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 msgid "<b>VPN Interface Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+msgid "N_amestore"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
-msgid "<b>Domain Owner Information</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
+msgid "QR code for the selected zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+msgid "Delete GNS entry"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+msgid "Delete"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+msgid "1 day"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 msgid "About gnunet-statistics-gtk"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index db580d89..84d55ca4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the gnunet-gtk package.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007.
 #
+#: src/setup/gnunet-setup-gns.c:1745
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.2\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: 2007-06-24 21:24+0200\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,8 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -39,42 +39,42 @@ msgstr "Välj fil att publicera till GNUnet"
 msgid "no description supplied"
 msgstr "Samling stoppad.\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 #, fuzzy
 msgid "_Download"
 msgstr "Hämta _ner"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 #, fuzzy
 msgid "Download _recursively"
 msgstr "r_ekursivt"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 #, fuzzy
 msgid "Download _as..."
 msgstr "Hämta _ner"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 #, fuzzy
 msgid "_Abort download"
 msgstr "Hämta _ner"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr "_Kopiera URI till urklipp"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Pub_licera"
@@ -116,122 +116,191 @@ msgstr "Välj alla filer"
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, 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:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 msgid "<unnamed>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr "Fel vid åtkomst till filen \"%s\"."
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
+#: 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/glade.c:118
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
+
+#: src/lib/os_installation.c:284
 #, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:281
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
 #, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
+msgid "Failed to initialize communication with peerinfo service!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:286
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
 #, c-format
-msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
+#, c-format
+msgid "Invalid regular expression `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
+#: src/setup/gnunet-setup.c:208
+#, 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:257
+#, 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:268
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:499
+#: src/setup/gnunet-setup.c:278
 #, c-format
-msgid "Option `%s' missing in section `%s'\n"
+msgid "Failed to initialize widget `%s' with value `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:524
+#: src/setup/gnunet-setup.c:603
 #, fuzzy
-msgid "Failed to connect to namestore\n"
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
+msgstr "Starta konfigurations_guiden"
+
+#: src/setup/gnunet-setup.c:624
+#, fuzzy
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr "Starta konfigurations_guiden"
+
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
 msgstr ""
-"Misslyckades att lägga till innehåll till namnrymd (konsultera loggarna).\n"
 
-#: src/gns/gnunet-gns-gtk.c:555
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Publiceringar</b>"
+#: src/setup/gnunet-setup.c:631
+msgid ""
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
+msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:287
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
 #, c-format
-msgid ""
-"%s\n"
-"%s\n"
+msgid "`%s' is not a valid port number!\n"
 msgstr ""
 
-#: src/lib/glade.c:118
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "Misslyckades att läsa in instick \"%s\"\n"
+#: src/setup/gnunet-setup-dns-exit.c:684
+msgid "Specification of .gnunet TLD"
+msgstr ""
 
-#: src/lib/os_installation.c:284
+#: src/setup/gnunet-setup-gns.c:35
+msgid "<new name>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
+msgstr "aldrig"
+
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+#, fuzzy
+msgid "Failed to initialize QR-code pixbuf"
+msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+
+#: src/setup/gnunet-setup-gns.c:424
 #, c-format
 msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+"%s\n"
+"%s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
-#, c-format
-msgid "Failed to initialize communication with peerinfo service!\n"
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+msgid "Failed to remove record"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
-#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#: src/setup/gnunet-setup-gns.c:610
+msgid "Invalid pseudonym specified for zone"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
 #, c-format
-msgid "Widget `%s' not found\n"
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
 #, c-format
-msgid "Invalid regular expression `%s'\n"
+msgid "New Pseudonym could not be set: `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:170
-#, 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-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+#, fuzzy
+msgid "Failed to load zone"
+msgstr "Misslyckades att läsa in instick \"%s\"\n"
 
-#: src/setup/gnunet-setup.c:219
+#: src/setup/gnunet-setup-gns.c:1902
 #, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Misslyckades att hitta en hanterare för \"%s\"\n"
+msgid "<b>Editing zone %s</b>"
+msgstr "<b>Publiceringar</b>"
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup-gns.c:1958
 #, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
+msgid "Option `%s' missing in section `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:240
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
 msgstr ""
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2041
+#, 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/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -268,305 +337,355 @@ msgstr "Välj fil att publicera till GNUnet"
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-msgid "Specification of .gnunet TLD"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
 #: src/statistics/functions.c:519
@@ -640,7 +759,6 @@ msgid "Connected to %Lu peers"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -648,7 +766,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -656,7 +773,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -664,7 +780,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -672,7 +787,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -681,7 +795,6 @@ msgid "Credits"
 msgstr "Visa tack"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -689,7 +802,6 @@ msgid "License"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -886,7 +998,6 @@ msgid "Search"
 msgstr "Sö_k"
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 msgid "_Help"
@@ -1084,6 +1195,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 #, fuzzy
 msgid "_Cancel"
 msgstr "A_vancerat"
@@ -1113,16 +1238,21 @@ msgstr "Publiserat filnamn"
 msgid "Index file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+msgid "Status"
+msgstr "Status"
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 #, fuzzy
 msgid "Publishing"
 msgstr "Pub_licera"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1130,80 +1260,16 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 #, fuzzy
 msgid "Indexed files"
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "_Identifierare:"
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-#, fuzzy
-msgid "gnunet-gns-gtk"
-msgstr "gnunet-gtk"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-msgid "Delete Record"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-#, fuzzy
-msgid "_File"
-msgstr "Filnamn"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-#, fuzzy
-msgid "_Options"
-msgstr "Anslutningar"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-#, fuzzy
-msgid "Automatically shorten names"
-msgstr "Avbryt auto_matiskt sökningen efter (s):"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
@@ -1930,50 +1996,208 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "Meddelanden"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Uppladdningar</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+#, fuzzy
+msgid "Never"
+msgstr "aldrig"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+#, fuzzy
+msgid "Minutes:"
+msgstr "minuter"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+#, fuzzy
+msgid "Seconds:"
+msgstr "sekunder"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Publiceringar</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Fil_delning"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -1982,11 +2206,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -1997,117 +2221,117 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 msgid "Friends file:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 #, fuzzy
 msgid "Min. connected friends:"
 msgstr "Nedkopplad från gnunetd.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr "_Allmänt"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 #, fuzzy
 msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 #, fuzzy
 msgid "Attempt automatic configuration"
 msgstr "Starta konfigurations_guiden"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -2116,26 +2340,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -2143,300 +2367,310 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 msgid "External (public) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 #, fuzzy
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 #, fuzzy
 msgid "Test configuration"
 msgstr "_Avancerad konfiguration"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Körande applikationer</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 #, fuzzy
 msgid "gnunet"
 msgstr "gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Välj konfigurationsfil för gnunetd"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 #, fuzzy
 msgid "Username:"
 msgstr "_Filnamn:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 #, fuzzy
 msgid "Configuration:"
 msgstr "Konfigurera d_emon"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Fil_delning"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -2444,11 +2678,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2456,12 +2690,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Ingående trafik"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2472,148 +2706,199 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 msgid "IPv4 address for interface:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 msgid "IPv6 address for interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 #, fuzzy
 msgid "<b>VPN Interface Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Konfiguration för GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+#, fuzzy
+msgid "N_amestore"
+msgstr "_Namnrymd"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
 #, fuzzy
-msgid "<b>Domain Owner Information</b>"
-msgstr "<b>Konfiguration för GNUnet</b>"
+msgid "QR code for the selected zone"
+msgstr "Stäng den valda sökningen"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 #, fuzzy
 msgid "Welcome to gnunet-setup."
 msgstr "Ansluten till gnunetd.\n"
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+msgid "Delete GNS entry"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+#, fuzzy
+msgid "Delete"
+msgstr "ta _bort"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+#, fuzzy
+msgid "1 day"
+msgstr "dygn"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-statistics-gtk"
@@ -2643,6 +2928,26 @@ msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid "gnunet-gns-gtk"
+#~ msgstr "gnunet-gtk"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "Filnamn"
+
+#, fuzzy
+#~ msgid "_Options"
+#~ msgstr "Anslutningar"
+
+#, fuzzy
+#~ msgid "Automatically shorten names"
+#~ msgstr "Avbryt auto_matiskt sökningen efter (s):"
+
+#, fuzzy
+#~ msgid "<b>Domain Owner Information</b>"
+#~ msgstr "<b>Konfiguration för GNUnet</b>"
+
+#, fuzzy
 #~ msgid "Peer"
 #~ msgstr "_Parter"
 
@@ -2756,10 +3061,6 @@ msgstr ""
 #~ msgstr "_Statistik"
 
 #, fuzzy
-#~ msgid "1 day"
-#~ msgstr "dygn"
-
-#, fuzzy
 #~ msgid "1 hour"
 #~ msgstr "timme"
 
@@ -2856,12 +3157,6 @@ msgstr ""
 #~ msgid "ms"
 #~ msgstr "ms"
 
-#~ msgid "minutes"
-#~ msgstr "minuter"
-
-#~ msgid "seconds"
-#~ msgstr "sekunder"
-
 #~ msgid "days"
 #~ msgstr "dygn"
 
@@ -2901,9 +3196,6 @@ msgstr ""
 #~ msgid "Failed to stop collection (consult logs).\n"
 #~ msgstr "Misslyckades att stoppa samling (konsultera loggarna).\n"
 
-#~ msgid "never"
-#~ msgstr "aldrig"
-
 #~ msgid "Filesize"
 #~ msgstr "Filstorlek"
 
@@ -2962,9 +3254,6 @@ msgstr ""
 #~ msgid "Data in datastore (in percent of allowed quota)"
 #~ msgstr "Data i datalagring (i procent av tillåten kvot)"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Identity"
 #~ msgstr "Identitet"
 
@@ -3337,9 +3626,6 @@ msgstr ""
 #~ msgid "c_reate"
 #~ msgstr "skap_a"
 
-#~ msgid "d_elete"
-#~ msgstr "ta _bort"
-
 #~ msgid ""
 #~ "Will prevent future insertions into the namespace (will not delete "
 #~ "content in the namespace)"
@@ -3614,9 +3900,6 @@ msgstr ""
 #~ msgid "<b>Metadata</b>"
 #~ msgstr "<b>Metadata</b>"
 
-#~ msgid "Close the selected search"
-#~ msgstr "Stäng den valda sökningen"
-
 #~ msgid "_Close"
 #~ msgstr "_Stäng"
 
@@ -3689,9 +3972,6 @@ msgstr ""
 #~ msgid "Select filename under which the search results should be saved"
 #~ msgstr "Välj filnamnet under vilket sökresultatet ska sparas"
 
-#~ msgid "<b>Uploads</b>"
-#~ msgstr "<b>Uppladdningar</b>"
-
 #~ msgid "Up_load"
 #~ msgstr "Ladda _upp"
 
diff --git a/po/tr.po b/po/tr.po
index 16760f16..a0272d2a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,11 +4,12 @@
 #
 # Nilgün Belma Bugüner <nilgun@buguner.name.tr>, 2006.
 # Bu dosyayı güncellemeyi biri üstlenirse memnun olurum.
+#: src/setup/gnunet-setup-gns.c:1745
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.0d.tr\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: 2006-11-02 21:03+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -18,8 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -41,41 +41,41 @@ msgstr ""
 msgid "no description supplied"
 msgstr "Albüm durdu.\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 #, fuzzy
 msgid "_Download"
 msgstr "İ_ndir"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 msgid "Download _recursively"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 #, fuzzy
 msgid "Download _as..."
 msgstr "İ_ndir"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 #, fuzzy
 msgid "_Abort download"
 msgstr "İ_ndir"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 #, fuzzy
 msgid "no URI"
 msgstr "Evrensel Özkaynak Betimleyici (URI)"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "Yayanlanmamış dosya ismi"
@@ -117,121 +117,188 @@ msgstr "Tüm dosyaları seçer"
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, c-format
 msgid "Could not load preview `%s' into memory\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 msgid "<unnamed>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
+#: 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/glade.c:118
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "`%s' eklentisi yüklenemedi\n"
+
+#: src/lib/os_installation.c:284
 #, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:281
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
 #, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
+msgid "Failed to initialize communication with peerinfo service!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#, c-format
+msgid "Widget `%s' not found\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:286
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
 #, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:208
+#, 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:257
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/setup/gnunet-setup.c:268
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:278
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
 msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
+#: src/setup/gnunet-setup.c:603
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:499
+#: src/setup/gnunet-setup.c:624
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:631
+msgid ""
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
 #, c-format
-msgid "Option `%s' missing in section `%s'\n"
+msgid "Option `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
+#, c-format
+msgid "`%s' is not a valid port number!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:524
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "İçerik isim alanına yerleştirilemedi (günlük kayıtlarına bakınız)\n"
+#: src/setup/gnunet-setup-dns-exit.c:684
+msgid "Specification of .gnunet TLD"
+msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:555
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Çalışan Uygulamalar</b>"
+#: src/setup/gnunet-setup-gns.c:35
+msgid "<new name>"
+msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:287
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+#, fuzzy
+msgid "Failed to initialize QR-code pixbuf"
+msgstr "`%s' için müdahale edilemiyor\n"
+
+#: src/setup/gnunet-setup-gns.c:424
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
-#: src/lib/glade.c:118
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "`%s' eklentisi yüklenemedi\n"
-
-#: src/lib/os_installation.c:284
-#, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+msgid "Failed to remove record"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
-#, c-format
-msgid "Failed to initialize communication with peerinfo service!\n"
+#: src/setup/gnunet-setup-gns.c:610
+msgid "Invalid pseudonym specified for zone"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
-#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
 #, c-format
-msgid "Widget `%s' not found\n"
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
 #, c-format
-msgid "Invalid regular expression `%s'\n"
+msgid "New Pseudonym could not be set: `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:170
-#, 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-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+#, fuzzy
+msgid "Failed to load zone"
+msgstr "`%s' eklentisi yüklenemedi\n"
 
-#: src/setup/gnunet-setup.c:219
+#: src/setup/gnunet-setup-gns.c:1902
 #, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "`%s' i��in müdahale edilemiyor\n"
+msgid "<b>Editing zone %s</b>"
+msgstr "<b>��alışan Uygulamalar</b>"
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup-gns.c:1958
 #, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
+msgid "Option `%s' missing in section `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:240
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
 msgstr ""
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup-gns.c:2041
+#, 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/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -268,305 +335,355 @@ msgstr ""
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 msgid "Configuration file for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 msgid "Configuration for Postgres (passed to PQconnectdb)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-msgid "Specification of .gnunet TLD"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
 #: src/statistics/functions.c:519
@@ -636,7 +753,6 @@ msgid "Connected to %Lu peers"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -644,7 +760,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -652,7 +767,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -660,7 +774,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -668,7 +781,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -677,7 +789,6 @@ msgid "Credits"
 msgstr "Destekleyenleri göster"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -685,7 +796,6 @@ msgid "License"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -876,7 +986,6 @@ msgid "Search"
 msgstr "A_ra"
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 msgid "_Help"
@@ -1073,6 +1182,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 #, fuzzy
 msgid "_Cancel"
 msgstr "Geli_şkin"
@@ -1101,16 +1224,22 @@ msgstr "Yayanlanmamış dosya ismi"
 msgid "Index file"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 msgid "Progress"
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+#, fuzzy
+msgid "Status"
+msgstr "D_urum"
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 #, fuzzy
 msgid "Publishing"
 msgstr "Yayanlanmamış dosya ismi"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1118,79 +1247,16 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 #, fuzzy
 msgid "Indexed files"
 msgstr "_Betimleyici:"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "_Betimleyici:"
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-#, fuzzy
-msgid "gnunet-gns-gtk"
-msgstr "GNUnet-gtk"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-msgid "Delete Record"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-#, fuzzy
-msgid "_File"
-msgstr "Dosya ismi"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-#, fuzzy
-msgid "_Options"
-msgstr "Bağlanırlık"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-msgid "Automatically shorten names"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 msgid "Quit"
 msgstr ""
@@ -1887,50 +1953,205 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "İletiler"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Gönderilenler</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+msgid "Minutes:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+msgid "Seconds:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Çalışan Uygulamalar</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
 msgid "File _Sharing"
 msgstr "Dosya _Paylaşımı"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -1939,11 +2160,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -1954,115 +2175,115 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 msgid "F_2F only"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 msgid "Friends file:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 #, fuzzy
 msgid "Min. connected friends:"
 msgstr "GNUnet artalan süreci ile bağlantı kesildi.\n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr "_Genel"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 msgid "<b>Bandwidth Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 msgid "Attempt automatic configuration"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -2071,26 +2292,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -2098,295 +2319,305 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 msgid "External (public) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 msgid "Test configuration"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 msgid "<b>Transport Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Çalışan Uygulamalar</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 msgid "Postgres"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 #, fuzzy
 msgid "gnunet"
 msgstr "GNUnet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 msgid "Configuration file:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 #, fuzzy
 msgid "Username:"
 msgstr "D_osya ismi:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 msgid "Configuration:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 #, fuzzy
 msgid "_File Sharing"
 msgstr "Dosya _Paylaşımı"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -2394,11 +2625,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2406,12 +2637,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Gelen Trafik"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2422,147 +2653,197 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 msgid "IPv4 address for interface:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 msgid "IPv6 address for interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 #, fuzzy
 msgid "<b>VPN Interface Configuration</b>"
 msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Kullanılabilir İçerik</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+#, fuzzy
+msgid "N_amestore"
+msgstr "_İsim alanı"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
 #, fuzzy
-msgid "<b>Domain Owner Information</b>"
-msgstr "<b>Kullanılabilir ��çerik</b>"
+msgid "QR code for the selected zone"
+msgstr "Seçili aramayı kapat��r"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 #, fuzzy
 msgid "Welcome to gnunet-setup."
 msgstr "GNUnet artalan sürecine bağlanıldı.\n"
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+msgid "Delete GNS entry"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+#, fuzzy
+msgid "Delete"
+msgstr "_sil"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+msgid "1 day"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-statistics-gtk"
@@ -2592,6 +2873,22 @@ msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid "gnunet-gns-gtk"
+#~ msgstr "GNUnet-gtk"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "Dosya ismi"
+
+#, fuzzy
+#~ msgid "_Options"
+#~ msgstr "Bağlanırlık"
+
+#, fuzzy
+#~ msgid "<b>Domain Owner Information</b>"
+#~ msgstr "<b>Kullanılabilir İçerik</b>"
+
+#, fuzzy
 #~ msgid "Peer"
 #~ msgstr "asla"
 
@@ -2792,12 +3089,6 @@ msgstr ""
 #~ msgid "<b>Downloads</b>"
 #~ msgstr "<b>İndirilenler</b>"
 
-#~ msgid "<b>Uploads</b>"
-#~ msgstr "<b>Gönderilenler</b>"
-
-#~ msgid "Stat_us"
-#~ msgstr "D_urum"
-
 #~ msgid ""
 #~ "Search GNUnet for content under the specified keyword (and, if "
 #~ "applicable, restrict the search to the given namespace)"
@@ -2925,9 +3216,6 @@ msgstr ""
 #~ msgid "c_reate"
 #~ msgstr "_oluştur"
 
-#~ msgid "d_elete"
-#~ msgstr "_sil"
-
 #~ msgid ""
 #~ "Will prevent future insertions into the namespace (will not delete "
 #~ "content in the namespace)"
@@ -3185,9 +3473,6 @@ msgstr ""
 #~ "İsim alanının öznitelikleri (reklamlarda kullanılmak üzere).  Seçilen "
 #~ "girdileri silmek için bağlamsal menüyü (sağ tık) kullanınız."
 
-#~ msgid "Close the selected search"
-#~ msgstr "Seçili aramayı kapatır"
-
 #~ msgid "_Close"
 #~ msgstr "_Kapat"
 
diff --git a/po/vi.po b/po/vi.po
index 8606cb4d..48e1d164 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,11 +5,12 @@
 # Phan Vinh Thinh <teppi82@gmail.com>, 2005.
 # Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
 #
+#: src/setup/gnunet-setup-gns.c:1745
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2012-06-01 21:58+0200\n"
+"POT-Creation-Date: 2012-11-05 13:52+0100\n"
 "PO-Revision-Date: 2010-02-11 21:43+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -20,8 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: src/fs/gnunet-fs-gtk.c:438 src/gns/gnunet-gns-gtk.c:597
-#: src/peerinfo/gnunet-peerinfo-gtk.c:527
+#: src/fs/gnunet-fs-gtk.c:493 src/peerinfo/gnunet-peerinfo-gtk.c:531
 #: src/statistics/gnunet-statistics-gtk.c:295
 msgid "start in tray mode"
 msgstr ""
@@ -43,42 +43,42 @@ msgstr ""
 msgid "no description supplied"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:795
+#: src/fs/gnunet-fs-gtk_event-handler.c:868
 #: contrib/gnunet_fs_gtk_main_window.glade:271
 #, fuzzy
 msgid "_Download"
 msgstr "Tải _xuống"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:804
+#: src/fs/gnunet-fs-gtk_event-handler.c:877
 #, fuzzy
 msgid "Download _recursively"
 msgstr "đệ _quy"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:813
+#: src/fs/gnunet-fs-gtk_event-handler.c:886
 #, fuzzy
 msgid "Download _as..."
 msgstr "Tải _xuống"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:825
+#: src/fs/gnunet-fs-gtk_event-handler.c:898
 #, fuzzy
 msgid "_Abort download"
 msgstr "Tải _xuống"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:836
-#: src/fs/gnunet-fs-gtk_event-handler.c:2914
+#: src/fs/gnunet-fs-gtk_event-handler.c:909
+#: src/fs/gnunet-fs-gtk_event-handler.c:3112
 msgid "_Copy URI to Clipboard"
 msgstr "_Chép URI vào bảng nháp"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1577
+#: src/fs/gnunet-fs-gtk_event-handler.c:1680
 msgid "Error!"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:1739
+#: src/fs/gnunet-fs-gtk_event-handler.c:1838
 #, fuzzy
 msgid "no URI"
 msgstr "URI"
 
-#: src/fs/gnunet-fs-gtk_event-handler.c:2924
+#: src/fs/gnunet-fs-gtk_event-handler.c:3122
 #, fuzzy
 msgid "_Abort publishing"
 msgstr "_Xuất bản"
@@ -120,121 +120,191 @@ msgstr "Chọn mọi tập tin"
 msgid "Specify a value"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:991
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1048
 #, 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:1159
+#: src/fs/gnunet-fs-gtk_publish-edit-dialog.c:1230
 msgid "<unnamed>"
 msgstr ""
 
-#: src/fs/gnunet-fs-gtk_unindex.c:332
+#: src/fs/gnunet-fs-gtk_unindex.c:337
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s'\n"
 msgstr "Lỗi truy cập tập tin « %s »."
 
-#: src/gns/gnunet-gns-gtk.c:152 src/gns/gnunet-gns-gtk.c:157
+#: 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/glade.c:118
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
+
+#: src/lib/os_installation.c:284
 #, c-format
-msgid "New Pseudonym could not be set: `%s'\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-peerinfo-gtk.c:496
+#, c-format
+msgid "Failed to initialize communication with peerinfo service!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:281
+#: src/setup/gnunet-setup.c:151 src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:160 src/setup/gnunet-setup.c:175
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:208
 #, fuzzy, c-format
-msgid ""
-"Changes to autoshorten could not be written to configuration file: `%s'\n"
-msgstr "Thay đổi tên của tập tin cấu hình"
+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/gns/gnunet-gns-gtk.c:286
+#: src/setup/gnunet-setup.c:257
 #, fuzzy, c-format
-msgid ""
-"Changes to autoshorten option could not be written to configuration file: `"
-"%s'\n"
-msgstr "Thay đổi tên của tập tin cấu hình"
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/gns/gnunet-gns-gtk.c:465
-msgid "Namestore service is not running!\n"
+#: src/setup/gnunet-setup.c:268
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:499
+#: src/setup/gnunet-setup.c:278
 #, c-format
-msgid "Option `%s' missing in section `%s'\n"
+msgid "Failed to initialize widget `%s' with value `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:510
-msgid "Failed to read or create private zone key\n"
+#: src/setup/gnunet-setup.c:474 src/setup/gnunet-setup.c:475
+msgid ""
+"Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' "
+"allows it)"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk.c:524
+#: src/setup/gnunet-setup.c:603
 #, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "L��i chèn n���i dung vào mi��n t��n (xem b��n ghi).\n"
+msgid "Attempting fully-automatic, non-interactive network configuration\n"
+msgstr "Kh��i ch���y t_r�� l�� c��u hình"
 
-#: src/gns/gnunet-gns-gtk.c:555
-#, fuzzy, c-format
-msgid "<b>Editing zone %s</b>"
-msgstr "<b>Bài xu��t b��n</b>"
+#: src/setup/gnunet-setup.c:624
+#, fuzzy
+msgid "attempt automatic configuration of the network and instantly exit"
+msgstr "Khởi ch��y t_rợ lý c��u hình"
 
-#: src/gns/gnunet-gns-gtk_zone.c:282
-msgid "Record could not be deleted:"
+#: src/setup/gnunet-setup.c:628
+msgid "run as user 'gnunet', if necessary by executing gksu to elevate rights"
 msgstr ""
 
-#: src/gns/gnunet-gns-gtk_zone.c:287
-#, c-format
+#: src/setup/gnunet-setup.c:631
 msgid ""
-"%s\n"
-"%s\n"
+"force showing the full set of options, even if gnunet-setup is run as a "
+"normal user and as a user 'gnunet' exists on the system, most options should "
+"not apply to the normal user as GNUnet should be run by the 'gnunet' user"
 msgstr ""
 
-#: src/lib/glade.c:118
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
+#: src/setup/gnunet-setup-dns-exit.c:85 src/setup/gnunet-setup-dns-exit.c:93
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:104 src/setup/gnunet-setup-dns-exit.c:112
+#, c-format
+msgid "`%s' is not a valid port number!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-dns-exit.c:684
+#, fuzzy
+msgid "Specification of .gnunet TLD"
+msgstr "Ở đây thì xác định vị trí của tập tin « gnunetd.conf »"
+
+#: src/setup/gnunet-setup-gns.c:35
+msgid "<new name>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:41
+msgid "<new record>"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:51
+#: contrib/gnunet_setup_gtk_main_window.glade:4914
+msgid "never"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:56
+msgid "invalid"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:365 src/setup/gnunet-setup-gns.c:1528
+#, fuzzy
+msgid "Failed to initialize QR-code pixbuf"
 msgstr "Lỗi tìm bộ quản lý « %s »\n"
 
-#: src/lib/os_installation.c:284
+#: src/setup/gnunet-setup-gns.c:424
 #, c-format
 msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
+"%s\n"
+"%s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-peerinfo-gtk.c:493
-#, c-format
-msgid "Failed to initialize communication with peerinfo service!\n"
+#: src/setup/gnunet-setup-gns.c:464 src/setup/gnunet-setup-gns.c:685
+msgid "Failed to remove record"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:205
-#: src/setup/gnunet-setup-options.c:393 src/setup/gnunet-setup-options.c:413
+#: src/setup/gnunet-setup-gns.c:610
+msgid "Invalid pseudonym specified for zone"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:1070 src/setup/gnunet-setup-gns.c:1630
 #, c-format
-msgid "Widget `%s' not found\n"
+msgid "Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#: src/setup/gnunet-setup-gns.c:1596 src/setup/gnunet-setup-gns.c:1601
 #, c-format
-msgid "Invalid regular expression `%s'\n"
+msgid "New Pseudonym could not be set: `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:170
-#, 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-gns.c:1889 src/setup/gnunet-setup-gns.c:1960
+#, fuzzy
+msgid "Failed to load zone"
+msgstr "Lỗi tìm b�� qu��n lý �� %s ��\n"
 
-#: src/setup/gnunet-setup.c:219
+#: src/setup/gnunet-setup-gns.c:1902
 #, fuzzy, c-format
-msgid "Failed to initialize widget `%s'\n"
-msgstr "Lỗi tìm b��� qu���n lý « %s »\n"
+msgid "<b>Editing zone %s</b>"
+msgstr "<b>Bài xuất bản</b>"
 
-#: src/setup/gnunet-setup.c:230
+#: src/setup/gnunet-setup-gns.c:1958
 #, c-format
-msgid "No default value known for option `%s' in section `%s'\n"
+msgid "Option `%s' missing in section `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:240
-#, c-format
-msgid "Failed to initialize widget `%s' with value `%s'\n"
+#: src/setup/gnunet-setup-gns.c:1991
+msgid "short"
 msgstr ""
 
-#: src/setup/gnunet-setup-hostlist-server.c:174
+#: src/setup/gnunet-setup-gns.c:2007
+msgid "private"
+msgstr ""
+
+#: src/setup/gnunet-setup-gns.c:2041
+#, 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/setup/gnunet-setup-hostlist-server.c:177
 msgid ""
 "Could not determine whether the hostlist daemon has an integrated hostlist "
 "server!\n"
@@ -271,309 +341,358 @@ msgstr ""
 msgid "This port is already occupied by %s."
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:773 src/setup/gnunet-setup-options.c:781
-#, c-format
-msgid "Option `%s' is not formatted correctly!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:792 src/setup/gnunet-setup-options.c:800
-#, c-format
-msgid "`%s' is not a valid port number!\n"
-msgstr ""
-
-#: src/setup/gnunet-setup-options.c:1602
+#: src/setup/gnunet-setup-options.c:973
 msgid "Should GNUnet exclusively connect to friends?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1614
+#: src/setup/gnunet-setup-options.c:985
 msgid "Friends file containing the list of friendly peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1626
+#: src/setup/gnunet-setup-options.c:997
 msgid "Minimum number of friendly connections"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1638
+#: src/setup/gnunet-setup-options.c:1009
 msgid "Topology should always be loaded"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1651
+#: src/setup/gnunet-setup-options.c:1022
 msgid "Should hostlist support be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1664
+#: src/setup/gnunet-setup-options.c:1035
 msgid "Should file-sharing be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1676
+#: src/setup/gnunet-setup-options.c:1047
 msgid "Should GNUnet learn about other peers using hostlists"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1688
+#: src/setup/gnunet-setup-options.c:1059
 msgid "Should GNUnet learn hostlists from other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1700
+#: src/setup/gnunet-setup-options.c:1071
 msgid "Should this peer offer a hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1712
+#: src/setup/gnunet-setup-options.c:1083
 msgid "Should this peer advertise its hostlist to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1724
+#: src/setup/gnunet-setup-options.c:1095
 msgid "Port this peers hostlist should be offered on"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1756
+#: src/setup/gnunet-setup-options.c:1127
 msgid "Known hostlist URLs"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1767
+#: src/setup/gnunet-setup-options.c:1138
 msgid "How many bytes per second are we allowed to transmit?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1779
+#: src/setup/gnunet-setup-options.c:1150
 msgid "How many bytes per second are we allowed to receive?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1793
+#: src/setup/gnunet-setup-options.c:1164
 msgid "Enable communication via TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1805
+#: src/setup/gnunet-setup-options.c:1176
 msgid "Enable communication via UDP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1817
+#: src/setup/gnunet-setup-options.c:1188
 msgid "Enable communication via HTTP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1829
+#: src/setup/gnunet-setup-options.c:1200
 msgid "Enable communication via HTTPS"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1841
+#: src/setup/gnunet-setup-options.c:1212
 msgid "Enable communication via DV"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1853
+#: src/setup/gnunet-setup-options.c:1224
 msgid "Enable communication via WLAN"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1865
+#: src/setup/gnunet-setup-options.c:1236
 msgid "Port we bind to for TCP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1877
+#: src/setup/gnunet-setup-options.c:1248 src/setup/gnunet-setup-options.c:1371
+#: src/setup/gnunet-setup-options.c:1395 src/setup/gnunet-setup-options.c:1419
 msgid "Port visible to other peers"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1889
+#: src/setup/gnunet-setup-options.c:1260
 msgid "Check if this peer is behind a NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1901
+#: src/setup/gnunet-setup-options.c:1272
 msgid "Check if the NAT has been configured manually to forward ports"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1913
+#: src/setup/gnunet-setup-options.c:1284
 msgid "Enable NAT traversal with UPnP/PMP"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1926
+#: src/setup/gnunet-setup-options.c:1297
 msgid "Enable NAT traversal with ICMP as server"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1939
+#: src/setup/gnunet-setup-options.c:1310
 msgid "External (public) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1951
+#: src/setup/gnunet-setup-options.c:1322
 msgid "Enable NAT traversal with ICMP as client"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1963
+#: src/setup/gnunet-setup-options.c:1334
 msgid "Internal (private) IP address of the NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1975
+#: src/setup/gnunet-setup-options.c:1346
 msgid "Disable IPv6 support"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:1988
+#: src/setup/gnunet-setup-options.c:1359
 msgid "Port for inbound UDP packets, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2000
+#: src/setup/gnunet-setup-options.c:1383
 msgid "Port for inbound HTTP connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2012
+#: src/setup/gnunet-setup-options.c:1407
 msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2026
+#: src/setup/gnunet-setup-options.c:1433
 msgid "Use sqLite to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2038
+#: src/setup/gnunet-setup-options.c:1445
 msgid "Use MySQL to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2050
+#: src/setup/gnunet-setup-options.c:1457
 msgid "Use Postgres to store file-sharing content"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2062 src/setup/gnunet-setup-options.c:2207
+#: src/setup/gnunet-setup-options.c:1469 src/setup/gnunet-setup-options.c:1614
 msgid "Name for the MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2074 src/setup/gnunet-setup-options.c:2219
+#: src/setup/gnunet-setup-options.c:1481 src/setup/gnunet-setup-options.c:1626
 #, 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:2086 src/setup/gnunet-setup-options.c:2231
+#: src/setup/gnunet-setup-options.c:1493 src/setup/gnunet-setup-options.c:1638
 msgid "Username for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2098 src/setup/gnunet-setup-options.c:2243
+#: src/setup/gnunet-setup-options.c:1505 src/setup/gnunet-setup-options.c:1650
 msgid "Password for MySQL access"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2110 src/setup/gnunet-setup-options.c:2255
+#: src/setup/gnunet-setup-options.c:1517 src/setup/gnunet-setup-options.c:1662
 msgid "Name of host running MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2122 src/setup/gnunet-setup-options.c:2279
+#: src/setup/gnunet-setup-options.c:1529 src/setup/gnunet-setup-options.c:1686
 msgid "Port of MySQL database"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2134 src/setup/gnunet-setup-options.c:2291
+#: src/setup/gnunet-setup-options.c:1541 src/setup/gnunet-setup-options.c:1698
+#: src/setup/gnunet-setup-options.c:1983
 #, 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:2147
+#: src/setup/gnunet-setup-options.c:1554
 msgid "Should we try to push our content to other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2159
+#: src/setup/gnunet-setup-options.c:1566
 msgid "Are we allowed to cache content received from other peers?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2171
+#: src/setup/gnunet-setup-options.c:1578
 msgid "Use sqLite to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2183
+#: src/setup/gnunet-setup-options.c:1590
 msgid "Use MySQL to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2195
+#: src/setup/gnunet-setup-options.c:1602
 msgid "Use Postgres to cache DHT data"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2267
+#: src/setup/gnunet-setup-options.c:1674
 msgid "Name of monitoring interface to use (monX)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2305
+#: src/setup/gnunet-setup-options.c:1712
 msgid "Should the VPN/PT be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2319
+#: src/setup/gnunet-setup-options.c:1726
 msgid "Tunnel IPv4 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2333
+#: src/setup/gnunet-setup-options.c:1740
 msgid "Tunnel IPv6 traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2346
+#: src/setup/gnunet-setup-options.c:1753
 msgid "Tunnel DNS traffic over GNUnet"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2358
+#: src/setup/gnunet-setup-options.c:1765
 msgid "Name of the virtual interface the GNUnet VPN should create"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2370
+#: src/setup/gnunet-setup-options.c:1777
 msgid "IPv4 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2382
+#: src/setup/gnunet-setup-options.c:1789
 msgid "IPv4 network mask to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2394
+#: src/setup/gnunet-setup-options.c:1801
 msgid "IPv6 address to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2406
+#: src/setup/gnunet-setup-options.c:1813
 msgid "IPv6 network prefix length to use for the VPN interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2422
+#: src/setup/gnunet-setup-options.c:1829
 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:2435
+#: src/setup/gnunet-setup-options.c:1842
 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:2448
+#: src/setup/gnunet-setup-options.c:1855
 msgid ""
 "Allow other peers to perform DNS resolutions using your Internet connection"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2461
+#: src/setup/gnunet-setup-options.c:1868
 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:2473
+#: src/setup/gnunet-setup-options.c:1880
 msgid "IPv4 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2485
+#: src/setup/gnunet-setup-options.c:1892
 msgid "IPv4 network mask to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2497
+#: src/setup/gnunet-setup-options.c:1904
 msgid "IPv6 address to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2510
+#: src/setup/gnunet-setup-options.c:1917
 msgid "IPv6 network prefix length to use for the Exit interface"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2524
+#: src/setup/gnunet-setup-options.c:1931
 msgid ""
 "Allow other users to use your Internet connection for UDP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2537
+#: src/setup/gnunet-setup-options.c:1944
 msgid ""
 "Allow other users to use your Internet connection for TCP traffic (via the "
 "Exit interface)"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2551
+#: src/setup/gnunet-setup-options.c:1959
+msgid "Use sqLite to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1971
+msgid "Use PostGres to store names"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1997
 msgid "Should the GNS be started automatically on startup?"
 msgstr ""
 
-#: src/setup/gnunet-setup-options.c:2564
-#, fuzzy
-msgid "Specification of .gnunet TLD"
-msgstr "Ở đây thì xác định vị trí của tập tin « gnunetd.conf »"
+#: src/setup/gnunet-setup-transport.c:182
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:183
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:205
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:229
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:276
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:349
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:364
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:430
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:431
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:469
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:470
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:505
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-transport.c:506
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
 
 #: src/statistics/functions.c:519
 msgid "Connectivity"
@@ -645,7 +764,6 @@ msgid "Connected to %Lu peers"
 msgstr "Có kết nối tới %Lu đồng đẳng"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:96
-#: contrib/gnunet_gns_gtk_about_window.glade:87
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:158
 #: contrib/gnunet_setup_about_window.glade:158
 #: contrib/gnunet_statistics_gtk_about_window.glade:158
@@ -653,7 +771,6 @@ msgid "Developed by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:128
-#: contrib/gnunet_gns_gtk_about_window.glade:118
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:190
 #: contrib/gnunet_setup_about_window.glade:190
 #: contrib/gnunet_statistics_gtk_about_window.glade:190
@@ -661,7 +778,6 @@ msgid "Documented by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:161
-#: contrib/gnunet_gns_gtk_about_window.glade:150
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:223
 #: contrib/gnunet_setup_about_window.glade:223
 #: contrib/gnunet_statistics_gtk_about_window.glade:223
@@ -669,7 +785,6 @@ msgid "Translated by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:194
-#: contrib/gnunet_gns_gtk_about_window.glade:182
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:256
 #: contrib/gnunet_setup_about_window.glade:256
 #: contrib/gnunet_statistics_gtk_about_window.glade:256
@@ -677,7 +792,6 @@ msgid "Artwork by"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:239
-#: contrib/gnunet_gns_gtk_about_window.glade:222
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:301
 #: contrib/gnunet_setup_about_window.glade:301
 #: contrib/gnunet_statistics_gtk_about_window.glade:301
@@ -686,7 +800,6 @@ msgid "Credits"
 msgstr "Hiện công trạng"
 
 #: contrib/gnunet_fs_gtk_about_window.glade:254
-#: contrib/gnunet_gns_gtk_about_window.glade:235
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:316
 #: contrib/gnunet_setup_about_window.glade:316
 #: contrib/gnunet_statistics_gtk_about_window.glade:316
@@ -694,7 +807,6 @@ msgid "License"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_about_window.glade:361
-#: contrib/gnunet_gns_gtk_about_window.glade:338
 #: contrib/gnunet_peerinfo_gtk_about_window.glade:65
 #: contrib/gnunet_setup_about_window.glade:65
 #: contrib/gnunet_statistics_gtk_about_window.glade:65
@@ -894,7 +1006,6 @@ msgid "Search"
 msgstr "_Tìm"
 
 #: contrib/gnunet_fs_gtk_main_window.glade:449
-#: contrib/gnunet_gns_gtk_main_window.glade:162
 #: contrib/gnunet_peerinfo_gtk_main_window.glade:44
 #: contrib/gnunet_statistics_gtk_main_window.glade:25
 msgid "_Help"
@@ -1093,6 +1204,20 @@ msgid "_Execute"
 msgstr ""
 
 #: contrib/gnunet_fs_gtk_publish_dialog.glade:423
+msgid "Remove all _Keywords"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:429
+msgid ""
+"This button removes all keywords from all files and directories in this "
+"dialog.  This is useful if you want to get rid of the automatically "
+"extracted keywords to make sure that your published file(s) are only "
+"available from the resulting URI or from keywords that you manually enter "
+"after clicking this button.  Note that meta data is unaffected when using "
+"this function."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:441
 #, fuzzy
 msgid "_Cancel"
 msgstr "Cấp ca_o"
@@ -1123,17 +1248,22 @@ msgstr "Tên tập tin đã xuất bản"
 msgid "Index file"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:52
+#: contrib/gnunet_fs_gtk_publish_tab.glade:55
 #, fuzzy
 msgid "Progress"
 msgstr "Tiến hành"
 
-#: contrib/gnunet_fs_gtk_publish_tab.glade:90
+#: contrib/gnunet_fs_gtk_publish_tab.glade:67
+#: contrib/gnunet_fs_gtk_search_tab.glade:92
+msgid "Status"
+msgstr "Trạng thái"
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:108
 #, fuzzy
 msgid "Publishing"
 msgstr "_Xuất bản"
 
-#: contrib/gnunet_fs_gtk_search_tab.glade:203
+#: contrib/gnunet_fs_gtk_search_tab.glade:222
 msgid "You shouldn't see this also"
 msgstr ""
 
@@ -1141,79 +1271,16 @@ msgstr ""
 msgid "Select pseudonym..."
 msgstr ""
 
-#: contrib/gnunet_fs_gtk_unindex.glade:27
+#: contrib/gnunet_fs_gtk_unindex.glade:29
 #, fuzzy
 msgid "Indexed files"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_fs_gtk_unindex.glade:110
+#: contrib/gnunet_fs_gtk_unindex.glade:113
 #, fuzzy
 msgid "Unindex the selected indexed file."
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_gns_gtk_about_window.glade:6
-#: contrib/gnunet_gns_gtk_main_window.glade:67
-#, fuzzy
-msgid "gnunet-gns-gtk"
-msgstr "Giới thiệu gnunet-gtk"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:13
-msgid "Delete Record"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:29
-msgid "Record expires in 1 day"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:39
-msgid "Record expires in 1 week"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:49
-msgid "Record expires in 1 year"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:59
-msgid "Record never expires"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:83
-#, fuzzy
-msgid "_File"
-msgstr "Tên tập tin"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:137
-#, fuzzy
-msgid "_Options"
-msgstr "Th_ao tác"
-
-#: contrib/gnunet_gns_gtk_main_window.glade:148
-msgid "Automatically shorten names"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:209
-msgid "Preferred zone name (PSEU):"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:222
-msgid ""
-"Enter the preferred name for this zone here.  The value will be stored in "
-"the PSEU record for your public key.  This is the GNS equivalent of your "
-"domain name.  You should try to pick a name that is globally unique."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:244
-msgid "Copy the public key of this zone to the clipboard."
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_main_window.glade:264
-msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
-msgstr ""
-
-#: contrib/gnunet_gns_gtk_zone_open.glade:9
-msgid "Open zone file..."
-msgstr ""
-
 #: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
@@ -2005,50 +2072,207 @@ msgstr ""
 msgid "About gnunet-setup"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:43
+#: contrib/gnunet_setup_gns_edit_a.glade:56
+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_setup_gns_edit_a.glade:92
+msgid "Name of the record in the zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:110
+msgid "in"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:123
+msgid ""
+"Select the desired zone for the record.  Changing this value here will move "
+"the record to the selected zone."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:142
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "<b>Siêu dữ liệu</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:173
+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_setup_gns_edit_a.glade:195
+msgid "<b>Destination IPv4 Address</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:224
+msgid "Record is public (visible to other users)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:229
+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_setup_gns_edit_a.glade:240
+msgid "Record is a shadow record (valid after other records expire)"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:245
+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_setup_gns_edit_a.glade:262
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Ứng dụng đang chạy</b>"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:297
+msgid "Relative"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:302
+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_setup_gns_edit_a.glade:314
+msgid "Absolute"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:319
+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_setup_gns_edit_a.glade:332
+msgid "Never"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:337
+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_setup_gns_edit_a.glade:359
+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_setup_gns_edit_a.glade:379
+msgid "Hours:"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:392
+msgid "Which hour of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:411
+#, fuzzy
+msgid "Minutes:"
+msgstr "phút"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:424
+msgid "Which minute of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:443
+#, fuzzy
+msgid "Seconds:"
+msgstr "giây"
+
+#: contrib/gnunet_setup_gns_edit_a.glade:456
+msgid "Which second of the day selected above should the record expire?"
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:482
+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."
+msgstr ""
+
+#: contrib/gnunet_setup_gns_edit_a.glade:501
+#, fuzzy
+msgid "<b>Expiration Time</b>"
+msgstr "<b>Bài xuất bản</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
 msgid "gnunet-setup"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:113
 msgid "Services:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:87
+#: contrib/gnunet_setup_gtk_main_window.glade:124
 msgid "Topology"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:92
+#: contrib/gnunet_setup_gtk_main_window.glade:129
 msgid ""
 "The topology subsystem is required as it ensures that your peer connects to "
 "other peers."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:106
+#: contrib/gnunet_setup_gtk_main_window.glade:144
 msgid "Hostlist"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:148
 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_gtk_main_window.glade:124
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
 msgid "File _Sharing"
 msgstr "C_hia sẻ tập tin"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:128
+#: contrib/gnunet_setup_gtk_main_window.glade:167
 msgid "Enable GNUnet's file-sharing subsystem."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:143
+#: contrib/gnunet_setup_gtk_main_window.glade:183
 msgid "PT/VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:147
+#: contrib/gnunet_setup_gtk_main_window.glade:187
 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 "
@@ -2057,11 +2281,11 @@ msgid ""
 "the first place by routing IP traffic over GNUnet."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:160
+#: contrib/gnunet_setup_gtk_main_window.glade:202
 msgid "EXIT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:206
 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 "
@@ -2072,118 +2296,118 @@ msgid ""
 "IPv6-only clients and IPv6-only servers from IPv4-only clients."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:177
+#: contrib/gnunet_setup_gtk_main_window.glade:221
 msgid "GNS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:181
+#: contrib/gnunet_setup_gtk_main_window.glade:225
 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_gtk_main_window.glade:199
+#: contrib/gnunet_setup_gtk_main_window.glade:246
 #, fuzzy
 msgid "<b>Service Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:225
+#: contrib/gnunet_setup_gtk_main_window.glade:275
 #, fuzzy
 msgid "F_2F only"
 msgstr "Chỉ tập ti_n"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:252
+#: contrib/gnunet_setup_gtk_main_window.glade:306
 #, fuzzy
 msgid "Friends file:"
 msgstr "Chỉ mụ_c"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:281
+#: contrib/gnunet_setup_gtk_main_window.glade:341
 msgid "Min. connected friends:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:311
+#: contrib/gnunet_setup_gtk_main_window.glade:376
 msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:340
+#: contrib/gnunet_setup_gtk_main_window.glade:409
 msgid "Use Hostlists to bootstrap"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:356
+#: contrib/gnunet_setup_gtk_main_window.glade:426
 msgid "Learn Servers from P2P Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:386
+#: contrib/gnunet_setup_gtk_main_window.glade:458
 msgid "Run Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:402
+#: contrib/gnunet_setup_gtk_main_window.glade:475
 msgid "Advertise Hostlist Server"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:422
-#: contrib/gnunet_setup_gtk_main_window.glade:2286
-#: contrib/gnunet_setup_gtk_main_window.glade:2783
+#: contrib/gnunet_setup_gtk_main_window.glade:498
+#: contrib/gnunet_setup_gtk_main_window.glade:2625
+#: contrib/gnunet_setup_gtk_main_window.glade:3228
 msgid "Port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:470
+#: contrib/gnunet_setup_gtk_main_window.glade:551
 msgid "Known Hostlist Servers:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:539
+#: contrib/gnunet_setup_gtk_main_window.glade:627
 msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:554
+#: contrib/gnunet_setup_gtk_main_window.glade:645
 msgid "_General"
 msgstr "Chun_g"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:584
+#: contrib/gnunet_setup_gtk_main_window.glade:679
 msgid "Max. download bandwidth (B/s):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:611
+#: contrib/gnunet_setup_gtk_main_window.glade:711
 msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:644
+#: contrib/gnunet_setup_gtk_main_window.glade:753
 #, fuzzy
 msgid "<b>Bandwidth Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:673
+#: contrib/gnunet_setup_gtk_main_window.glade:785
 msgid "Peer is behind _NAT"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:677
+#: contrib/gnunet_setup_gtk_main_window.glade:789
 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_gtk_main_window.glade:691
+#: contrib/gnunet_setup_gtk_main_window.glade:804
 #, fuzzy
 msgid "Attempt automatic configuration"
 msgstr "Khởi chạy t_rợ lý cấu hình"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:706
+#: contrib/gnunet_setup_gtk_main_window.glade:820
 msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:710
+#: contrib/gnunet_setup_gtk_main_window.glade:824
 msgid ""
 "Disable advertising IPv6 addresses. Check this box if you know that your "
 "system has no IPv6 Internet connectivity."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:751
+#: contrib/gnunet_setup_gtk_main_window.glade:868
 msgid "NAT ports have been opened manually"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:755
+#: contrib/gnunet_setup_gtk_main_window.glade:872
 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 "
@@ -2192,26 +2416,26 @@ msgid ""
 "the \"External (public) IPv4 address\" of your NAT box below."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:766
+#: contrib/gnunet_setup_gtk_main_window.glade:885
 msgid "Enable NAT traversal via UPnP or PMP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:770
+#: contrib/gnunet_setup_gtk_main_window.glade:889
 msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:782
+#: contrib/gnunet_setup_gtk_main_window.glade:902
 msgid "Enable NAT traversal using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:786
+#: contrib/gnunet_setup_gtk_main_window.glade:906
 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_gtk_main_window.glade:802
+#: contrib/gnunet_setup_gtk_main_window.glade:925
 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 "
@@ -2219,301 +2443,311 @@ msgid ""
 "external IP address (DynDNS setup)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:803
+#: contrib/gnunet_setup_gtk_main_window.glade:926
 msgid "External (public) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:834
+#: contrib/gnunet_setup_gtk_main_window.glade:963
 msgid "Enable connecting to NATed peers using ICMP method"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:838
+#: contrib/gnunet_setup_gtk_main_window.glade:967
 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_gtk_main_window.glade:855
+#: contrib/gnunet_setup_gtk_main_window.glade:987
 msgid ""
 "Specify the IPv4 address of your computers main network interface (typically "
 "eth0 or wlan0)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:856
+#: contrib/gnunet_setup_gtk_main_window.glade:988
 msgid "Internal (private) IPv4 address:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:902
+#: contrib/gnunet_setup_gtk_main_window.glade:1045
 #, fuzzy
 msgid "<b>NAT Traversal Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:920
+#: contrib/gnunet_setup_gtk_main_window.glade:1066
 msgid "_Network"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:948
+#: contrib/gnunet_setup_gtk_main_window.glade:1098
 msgid "Plugins to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:959
+#: contrib/gnunet_setup_gtk_main_window.glade:1109
 msgid "_TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:978
+#: contrib/gnunet_setup_gtk_main_window.glade:1129
 msgid "_UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:996
+#: contrib/gnunet_setup_gtk_main_window.glade:1148
 msgid "_HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1015
+#: contrib/gnunet_setup_gtk_main_window.glade:1168
 msgid "HTTP_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1034
+#: contrib/gnunet_setup_gtk_main_window.glade:1188
 msgid "D_V"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1051
+#: contrib/gnunet_setup_gtk_main_window.glade:1206
 msgid "_WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1089
-#: contrib/gnunet_setup_gtk_main_window.glade:1276
-#: contrib/gnunet_setup_gtk_main_window.glade:1455
-#: contrib/gnunet_setup_gtk_main_window.glade:1636
+#: contrib/gnunet_setup_gtk_main_window.glade:1247
+#: contrib/gnunet_setup_gtk_main_window.glade:1459
+#: contrib/gnunet_setup_gtk_main_window.glade:1664
+#: contrib/gnunet_setup_gtk_main_window.glade:1871
 msgid "Bind to port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1118
+#: contrib/gnunet_setup_gtk_main_window.glade:1281
 msgid "Use Port \"0\" to only allow outgoing TCP connections"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1141
-#: contrib/gnunet_setup_gtk_main_window.glade:1317
-#: contrib/gnunet_setup_gtk_main_window.glade:1496
-#: contrib/gnunet_setup_gtk_main_window.glade:1677
+#: contrib/gnunet_setup_gtk_main_window.glade:1306
+#: contrib/gnunet_setup_gtk_main_window.glade:1506
+#: contrib/gnunet_setup_gtk_main_window.glade:1711
+#: contrib/gnunet_setup_gtk_main_window.glade:1918
 msgid "Advertised port:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1170
-#: contrib/gnunet_setup_gtk_main_window.glade:1342
-#: contrib/gnunet_setup_gtk_main_window.glade:1523
-#: contrib/gnunet_setup_gtk_main_window.glade:1704
+#: contrib/gnunet_setup_gtk_main_window.glade:1340
+#: contrib/gnunet_setup_gtk_main_window.glade:1538
+#: contrib/gnunet_setup_gtk_main_window.glade:1745
+#: contrib/gnunet_setup_gtk_main_window.glade:1952
 msgid ""
 "External port visible on our public IP address after mappings by NAT/"
 "firewalls"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1199
-#: contrib/gnunet_setup_gtk_main_window.glade:1372
-#: contrib/gnunet_setup_gtk_main_window.glade:1553
-#: contrib/gnunet_setup_gtk_main_window.glade:1734
-#: contrib/gnunet_setup_gtk_main_window.glade:2336
-#: contrib/gnunet_setup_gtk_main_window.glade:2417
-#: contrib/gnunet_setup_gtk_main_window.glade:2833
-#: contrib/gnunet_setup_gtk_main_window.glade:2916
+#: contrib/gnunet_setup_gtk_main_window.glade:1373
+#: contrib/gnunet_setup_gtk_main_window.glade:1572
+#: contrib/gnunet_setup_gtk_main_window.glade:1779
+#: contrib/gnunet_setup_gtk_main_window.glade:1986
+#: contrib/gnunet_setup_gtk_main_window.glade:2685
+#: contrib/gnunet_setup_gtk_main_window.glade:2788
+#: contrib/gnunet_setup_gtk_main_window.glade:3288
+#: contrib/gnunet_setup_gtk_main_window.glade:3392
+#: contrib/gnunet_setup_gtk_main_window.glade:4327
 #, fuzzy
 msgid "Test configuration"
 msgstr "Cấu hình cấp c_ao"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1203
-#: contrib/gnunet_setup_gtk_main_window.glade:1376
-#: contrib/gnunet_setup_gtk_main_window.glade:1557
-#: contrib/gnunet_setup_gtk_main_window.glade:1738
+#: contrib/gnunet_setup_gtk_main_window.glade:1377
+#: contrib/gnunet_setup_gtk_main_window.glade:1576
+#: contrib/gnunet_setup_gtk_main_window.glade:1783
+#: contrib/gnunet_setup_gtk_main_window.glade:1990
 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_gtk_main_window.glade:1215
-#: contrib/gnunet_setup_gtk_main_window.glade:1388
-#: contrib/gnunet_setup_gtk_main_window.glade:1569
-#: contrib/gnunet_setup_gtk_main_window.glade:1750
-#: contrib/gnunet_setup_gtk_main_window.glade:2349
-#: contrib/gnunet_setup_gtk_main_window.glade:2430
-#: contrib/gnunet_setup_gtk_main_window.glade:2846
-#: contrib/gnunet_setup_gtk_main_window.glade:2929
+#: contrib/gnunet_setup_gtk_main_window.glade:1391
+#: contrib/gnunet_setup_gtk_main_window.glade:1590
+#: contrib/gnunet_setup_gtk_main_window.glade:1797
+#: contrib/gnunet_setup_gtk_main_window.glade:2004
+#: contrib/gnunet_setup_gtk_main_window.glade:2702
+#: contrib/gnunet_setup_gtk_main_window.glade:2805
+#: contrib/gnunet_setup_gtk_main_window.glade:3305
+#: contrib/gnunet_setup_gtk_main_window.glade:3409
+#: contrib/gnunet_setup_gtk_main_window.glade:4344
 msgid "Configuration works!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1227
-#: contrib/gnunet_setup_gtk_main_window.glade:1400
-#: contrib/gnunet_setup_gtk_main_window.glade:1581
-#: contrib/gnunet_setup_gtk_main_window.glade:1762
+#: contrib/gnunet_setup_gtk_main_window.glade:1404
+#: contrib/gnunet_setup_gtk_main_window.glade:1603
+#: contrib/gnunet_setup_gtk_main_window.glade:1810
+#: contrib/gnunet_setup_gtk_main_window.glade:2017
 msgid "Test failed!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1258
+#: contrib/gnunet_setup_gtk_main_window.glade:1439
 msgid "TCP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1275
-#: contrib/gnunet_setup_gtk_main_window.glade:1454
-#: contrib/gnunet_setup_gtk_main_window.glade:1635
+#: contrib/gnunet_setup_gtk_main_window.glade:1458
+#: contrib/gnunet_setup_gtk_main_window.glade:1663
+#: contrib/gnunet_setup_gtk_main_window.glade:1870
 msgid ""
 "Port number that GNUnet's UDP transport should bind to on the local system"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1434
+#: contrib/gnunet_setup_gtk_main_window.glade:1641
 msgid "UDP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1615
+#: contrib/gnunet_setup_gtk_main_window.glade:1848
 msgid "HTTP"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1796
+#: contrib/gnunet_setup_gtk_main_window.glade:2055
 msgid "HTTPS"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1818
+#: contrib/gnunet_setup_gtk_main_window.glade:2078
 msgid "DV"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1835
+#: contrib/gnunet_setup_gtk_main_window.glade:2097
 msgid "Name of _Monitor Interface"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1876
+#: contrib/gnunet_setup_gtk_main_window.glade:2143
 msgid "WLAN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1895
+#: contrib/gnunet_setup_gtk_main_window.glade:2165
 #, fuzzy
 msgid "<b>Transport Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1907
+#: contrib/gnunet_setup_gtk_main_window.glade:2178
 msgid "_Transports"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1933
+#: contrib/gnunet_setup_gtk_main_window.glade:2207
 msgid "Enable unsolicited content transmission from this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1950
+#: contrib/gnunet_setup_gtk_main_window.glade:2225
 msgid "Enable caching content at this peer"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1969
+#: contrib/gnunet_setup_gtk_main_window.glade:2248
 #, fuzzy
 msgid "<b>File Sharing Options</b>"
 msgstr "<b>Ứng dụng đang chạy</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:1999
+#: contrib/gnunet_setup_gtk_main_window.glade:2282
+#: contrib/gnunet_setup_gtk_main_window.glade:4183
 msgid "Database Backend to use:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2014
-#: contrib/gnunet_setup_gtk_main_window.glade:2128
-#: contrib/gnunet_setup_gtk_main_window.glade:2507
-#: contrib/gnunet_setup_gtk_main_window.glade:2621
+#: contrib/gnunet_setup_gtk_main_window.glade:2298
+#: contrib/gnunet_setup_gtk_main_window.glade:2424
+#: contrib/gnunet_setup_gtk_main_window.glade:2897
+#: contrib/gnunet_setup_gtk_main_window.glade:3023
+#: contrib/gnunet_setup_gtk_main_window.glade:4199
+#: contrib/gnunet_setup_gtk_main_window.glade:4263
 msgid "sqLite"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2031
-#: contrib/gnunet_setup_gtk_main_window.glade:2328
-#: contrib/gnunet_setup_gtk_main_window.glade:2524
-#: contrib/gnunet_setup_gtk_main_window.glade:2825
+#: contrib/gnunet_setup_gtk_main_window.glade:2316
+#: contrib/gnunet_setup_gtk_main_window.glade:2675
+#: contrib/gnunet_setup_gtk_main_window.glade:2915
+#: contrib/gnunet_setup_gtk_main_window.glade:3278
 msgid "MySQL"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2049
-#: contrib/gnunet_setup_gtk_main_window.glade:2409
-#: contrib/gnunet_setup_gtk_main_window.glade:2542
-#: contrib/gnunet_setup_gtk_main_window.glade:2908
+#: contrib/gnunet_setup_gtk_main_window.glade:2335
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#: contrib/gnunet_setup_gtk_main_window.glade:2934
+#: contrib/gnunet_setup_gtk_main_window.glade:3382
+#: contrib/gnunet_setup_gtk_main_window.glade:4218
+#: contrib/gnunet_setup_gtk_main_window.glade:4317
 #, fuzzy
 msgid "Postgres"
 msgstr "Tiến hành"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2084
-#: contrib/gnunet_setup_gtk_main_window.glade:2577
+#: contrib/gnunet_setup_gtk_main_window.glade:2374
+#: contrib/gnunet_setup_gtk_main_window.glade:2973
 msgid "Quota (bytes):"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2122
-#: contrib/gnunet_setup_gtk_main_window.glade:2615
+#: contrib/gnunet_setup_gtk_main_window.glade:2417
+#: contrib/gnunet_setup_gtk_main_window.glade:3016
+#: contrib/gnunet_setup_gtk_main_window.glade:4256
 msgid "No setup required."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2144
-#: contrib/gnunet_setup_gtk_main_window.glade:2637
+#: contrib/gnunet_setup_gtk_main_window.glade:2442
+#: contrib/gnunet_setup_gtk_main_window.glade:3041
 msgid "MySQL database name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2158
-#: contrib/gnunet_setup_gtk_main_window.glade:2651
+#: contrib/gnunet_setup_gtk_main_window.glade:2456
+#: contrib/gnunet_setup_gtk_main_window.glade:3055
 #, fuzzy
 msgid "gnunet"
 msgstr "Giới thiệu gnunet-gtk"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2178
-#: contrib/gnunet_setup_gtk_main_window.glade:2671
+#: contrib/gnunet_setup_gtk_main_window.glade:2486
+#: contrib/gnunet_setup_gtk_main_window.glade:3085
 #, fuzzy
 msgid "Configuration file:"
 msgstr "Tập tin _cấu hình dùng cho gnunetd:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2206
-#: contrib/gnunet_setup_gtk_main_window.glade:2700
+#: contrib/gnunet_setup_gtk_main_window.glade:2521
+#: contrib/gnunet_setup_gtk_main_window.glade:3121
 #, fuzzy
 msgid "Username:"
 msgstr "_Tên tập tin:"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2230
-#: contrib/gnunet_setup_gtk_main_window.glade:2725
+#: contrib/gnunet_setup_gtk_main_window.glade:2552
+#: contrib/gnunet_setup_gtk_main_window.glade:3153
 msgid "Password:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2261
-#: contrib/gnunet_setup_gtk_main_window.glade:2757
+#: contrib/gnunet_setup_gtk_main_window.glade:2593
+#: contrib/gnunet_setup_gtk_main_window.glade:3195
 msgid "MySQL Server Hostname:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2275
-#: contrib/gnunet_setup_gtk_main_window.glade:2771
+#: contrib/gnunet_setup_gtk_main_window.glade:2607
+#: contrib/gnunet_setup_gtk_main_window.glade:3209
 msgid "localhost"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2358
-#: contrib/gnunet_setup_gtk_main_window.glade:2439
-#: contrib/gnunet_setup_gtk_main_window.glade:2856
-#: contrib/gnunet_setup_gtk_main_window.glade:2938
+#: contrib/gnunet_setup_gtk_main_window.glade:2714
+#: contrib/gnunet_setup_gtk_main_window.glade:2817
+#: contrib/gnunet_setup_gtk_main_window.glade:3317
+#: contrib/gnunet_setup_gtk_main_window.glade:3421
+#: contrib/gnunet_setup_gtk_main_window.glade:4356
 msgid "Configuration error!"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2377
-#: contrib/gnunet_setup_gtk_main_window.glade:2875
+#: contrib/gnunet_setup_gtk_main_window.glade:2737
+#: contrib/gnunet_setup_gtk_main_window.glade:3340
+#: contrib/gnunet_setup_gtk_main_window.glade:4277
 #, fuzzy
 msgid "Configuration:"
 msgstr "Cấu hình cấp c_ao"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2464
+#: contrib/gnunet_setup_gtk_main_window.glade:2847
 msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2492
+#: contrib/gnunet_setup_gtk_main_window.glade:2881
 msgid "Datacache:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2964
+#: contrib/gnunet_setup_gtk_main_window.glade:3451
 msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:2981
+#: contrib/gnunet_setup_gtk_main_window.glade:3471
 #, fuzzy
 msgid "_File Sharing"
 msgstr "C_hia sẻ tập tin"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3011
+#: contrib/gnunet_setup_gtk_main_window.glade:3504
 msgid "Tunnel IPv4 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3015
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
 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 "
@@ -2521,11 +2755,11 @@ msgid ""
 "tunneling and 4to6 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3027
+#: contrib/gnunet_setup_gtk_main_window.glade:3521
 msgid "Tunnel IPv6 Traffic"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3031
+#: contrib/gnunet_setup_gtk_main_window.glade:3525
 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 "
@@ -2533,12 +2767,12 @@ msgid ""
 "tunneling and 6to4 protocol translation."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3043
+#: contrib/gnunet_setup_gtk_main_window.glade:3538
 #, fuzzy
 msgid "Tunnel DNS Traffic"
 msgstr "Dữ liệu gửi đến"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3047
+#: contrib/gnunet_setup_gtk_main_window.glade:3542
 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 "
@@ -2549,147 +2783,198 @@ msgid ""
 "case, so this does not provide you with strong anonymity)."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#: contrib/gnunet_setup_gtk_main_window.glade:3569
 #, fuzzy
 msgid "<b>Protocol Translation and Tunneling Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3102
+#: contrib/gnunet_setup_gtk_main_window.glade:3603
 msgid "_Interface name:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3115
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
 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_gtk_main_window.glade:3135
+#: contrib/gnunet_setup_gtk_main_window.glade:3645
 msgid "IPv4 address for interface:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3157
-#: contrib/gnunet_setup_gtk_main_window.glade:3209
-#: contrib/gnunet_setup_gtk_main_window.glade:3439
-#: contrib/gnunet_setup_gtk_main_window.glade:3493
+#: contrib/gnunet_setup_gtk_main_window.glade:3674
+#: contrib/gnunet_setup_gtk_main_window.glade:3742
+#: contrib/gnunet_setup_gtk_main_window.glade:4017
+#: contrib/gnunet_setup_gtk_main_window.glade:4087
 msgid "/"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3187
+#: contrib/gnunet_setup_gtk_main_window.glade:3713
 msgid "IPv6 address for interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3241
+#: contrib/gnunet_setup_gtk_main_window.glade:3782
 #, fuzzy
 msgid "<b>VPN Interface Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3260
+#: contrib/gnunet_setup_gtk_main_window.glade:3803
 msgid ""
 "Configuration of the GNUnet VPN and the Protocol Translation (6to4, 4to6, "
 "6over4, 4over6) facilities"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3261
+#: contrib/gnunet_setup_gtk_main_window.glade:3804
 msgid "_VPN"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3291
+#: contrib/gnunet_setup_gtk_main_window.glade:3837
 msgid "Enable DNS Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3306
+#: contrib/gnunet_setup_gtk_main_window.glade:3854
 msgid "Enable IPv4 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3310
+#: contrib/gnunet_setup_gtk_main_window.glade:3858
 msgid ""
 "This option will allow other peers to send IPv4 traffic to the Internet "
 "using your network connection."
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3322
+#: contrib/gnunet_setup_gtk_main_window.glade:3872
 msgid "Enable IPv6 Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3326
+#: contrib/gnunet_setup_gtk_main_window.glade:3876
 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_gtk_main_window.glade:3349
+#: contrib/gnunet_setup_gtk_main_window.glade:3904
 msgid "IP Address of external DNS Resolver:"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3381
+#: contrib/gnunet_setup_gtk_main_window.glade:3945
 msgid "Exit interface name: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3393
+#: contrib/gnunet_setup_gtk_main_window.glade:3958
 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_gtk_main_window.glade:3416
+#: contrib/gnunet_setup_gtk_main_window.glade:3987
 msgid "IPv4 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3428
+#: contrib/gnunet_setup_gtk_main_window.glade:4000
 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_gtk_main_window.glade:3470
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
 msgid "IPv6 address for Exit interface: "
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3482
+#: contrib/gnunet_setup_gtk_main_window.glade:4070
 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_gtk_main_window.glade:3525
+#: contrib/gnunet_setup_gtk_main_window.glade:4127
 #, fuzzy
 msgid "<b>GNUnet Exit Configuration</b>"
 msgstr "<b>Cấu hình Trình nền GNUnet</b>"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3544
+#: contrib/gnunet_setup_gtk_main_window.glade:4148
 msgid "_Exit"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3574
-msgid "_Preferred Name:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4386
+msgid "<b>Configure Namestore (persistent storage)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4406
+#, fuzzy
+msgid "N_amestore"
+msgstr "Miề_n tên"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4433
+msgid "<b>SET TO PUBLIC KEY OF THE ZONE</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4474
+msgid "Preferred zone name (PSEU):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4518
+msgid "_Master Zone"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4537
+msgid "_Private Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3612
-msgid "Cryptographic Identity:"
+#: contrib/gnunet_setup_gtk_main_window.glade:4556
+msgid "_Shorten Zone"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3662
+#: contrib/gnunet_setup_gtk_main_window.glade:4605
 #, fuzzy
-msgid "<b>Domain Owner Information</b>"
-msgstr "<b>Cấu h��nh Trình n���n GNUnet</b>"
+msgid "QR code for the selected zone"
+msgstr "Đ��ng tìm ki���m đã chọn"
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3775
-msgid "<b>GNS Database</b>"
+#: contrib/gnunet_setup_gtk_main_window.glade:4642
+msgid "<b><big>Loading...</big></b>"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3794
+#: contrib/gnunet_setup_gtk_main_window.glade:4787
 msgid "GN_S"
 msgstr ""
 
-#: contrib/gnunet_setup_gtk_main_window.glade:3810
+#: contrib/gnunet_setup_gtk_main_window.glade:4804
 msgid "Welcome to gnunet-setup."
 msgstr ""
 
+#: contrib/gnunet_setup_gtk_main_window.glade:4869
+msgid "Delete GNS entry"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4871
+#, fuzzy
+msgid "Delete"
+msgstr "gtk-delete"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4887
+#, fuzzy
+msgid "1 day"
+msgstr "ngày"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4896
+msgid "1 week"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4905
+msgid "1 year"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4929
+msgid "Pick expiration date from calendar"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4931
+msgid "Calendar"
+msgstr ""
+
 #: contrib/gnunet_statistics_gtk_about_dialog.glade:8
 #, fuzzy
 msgid "About gnunet-statistics-gtk"
@@ -2719,6 +3004,33 @@ msgid "_Storage"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten could not be written to configuration file: `%s'\n"
+#~ msgstr "Thay đổi tên của tập tin cấu hình"
+
+#, fuzzy
+#~ msgid ""
+#~ "Changes to autoshorten option could not be written to configuration file: "
+#~ "`%s'\n"
+#~ msgstr "Thay đổi tên của tập tin cấu hình"
+
+#, fuzzy
+#~ msgid "gnunet-gns-gtk"
+#~ msgstr "Giới thiệu gnunet-gtk"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "Tên tập tin"
+
+#, fuzzy
+#~ 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>"
+
+#, fuzzy
 #~ msgid "Peer"
 #~ msgstr "Đồn_g đẳng"
 
@@ -2829,10 +3141,6 @@ msgstr ""
 #~ msgstr "_Thống kê"
 
 #, fuzzy
-#~ msgid "1 day"
-#~ msgstr "ngày"
-
-#, fuzzy
 #~ msgid "1 hour"
 #~ msgstr "giờ"
 
@@ -2854,9 +3162,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "Mạng đồng đẳng của GNU"
 
-#~ msgid "Status"
-#~ msgstr "Trạng thái"
-
 #~ msgid "Identity"
 #~ msgstr "Nhận diện"
 
@@ -2927,12 +3232,6 @@ msgstr ""
 #~ msgid "ms"
 #~ msgstr "miligiây"
 
-#~ msgid "minutes"
-#~ msgstr "phút"
-
-#~ msgid "seconds"
-#~ msgstr "giây"
-
 #~ msgid "days"
 #~ msgstr "ngày"
 
@@ -3400,9 +3699,6 @@ msgstr ""
 #~ msgid "gtk-new"
 #~ msgstr "gtk-new"
 
-#~ msgid "gtk-delete"
-#~ msgstr "gtk-delete"
-
 #~ msgid ""
 #~ "Will prevent future insertions into the namespace (will not delete "
 #~ "content in the namespace)"
@@ -3693,9 +3989,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Xác nhận dữ liệu chỉ ra. Tạo miền tên và đưa ra lời giới thiệu quảng cáo."
 
-#~ msgid "Close the selected search"
-#~ msgstr "Đóng tìm kiếm đã chọn"
-
 #~ msgid "_Close"
 #~ msgstr "Đón_g"