potupdate

9 files changed, 8253 insertions, 1737 deletions

diff --git a/ChangeLog b/ChangeLog
index 1367d369..26ad4e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Mon Sep 19 14:25:55 CEST 2011
+        Releasing gnunet-gtk 0.9.0pre3.
+
 Fri Sep  9 10:43:26 CEST 2011
         Initial draft for gnunet-peerinfo-gtk.
         Fixing issues when compiling against Gtk 3.0 (which is now
@@ -7,12 +10,6 @@ Fri Sep  9 10:43:26 CEST 2011
 Mon Aug 15 16:18:22 CEST 2011
         Merging gnunet-setup and gnunet-gtk projects.
 
-Mon Jul 11 17:21:05 CEST 2011
-        Releasing gnunet-setup 0.9.0pre3.
-
-        With this release we will finally start with
-        a detailed accounting of changes in the ChangeLog.
-
 Mon Nov  1 13:03:59 CET 2010
         gnunet-setup started.
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5e598abf..c86425c5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,28 +1,58 @@
-contrib/open_directory_dialog.glade
-contrib/publish_edit_dialog.glade
-contrib/download_as.glade
-contrib/main_tab_new_frame.glade
-contrib/search_dialog.glade
-contrib/publish_dialog.glade
-contrib/open_url_dialog.glade
-contrib/search_tab.glade
-contrib/about.glade
-contrib/main-window.glade
-contrib/publish-file-dialog.glade
-contrib/publish_tab.glade
-contrib/status_bar_menu.glade
-contrib/publish-directory-dialog.glade
-src/main_window_file_publish.c
-src/about.c
-src/main_window_open_directory.c
-src/gnunet-gtk.c
-src/main_window_create_pseudonym.c
-src/fs_event_handler.c
-src/download.c
-src/main_window_file_download.c
-src/edit_publish_dialog.c
-src/peerinfo.c
-src/fs_anonymity_spin_buttons.c
-src/common.c
-src/main_window_view_toggles.c
-src/main_window_file_search.c
+src/peerinfo/gnunet-peerinfo-gtk.c
+src/peerinfo/gnunet-peerinfo-gtk-about.c
+src/peerinfo/gnunet-peerinfo-gtk-flags.c
+src/fs/gnunet-fs-gtk-main_window_file_publish.c
+src/fs/gnunet-fs-gtk-main_window_view_toggles.c
+src/fs/gnunet-fs-gtk-common.c
+src/fs/gnunet-fs-gtk-main_window_file_download.c
+src/fs/gnunet-fs-gtk-event_handler.c
+src/fs/gnunet-fs-gtk-main_window_open_directory.c
+src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
+src/fs/gnunet-fs-gtk-download.c
+src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
+src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+src/fs/gnunet-fs-gtk-about.c
+src/fs/gnunet-fs-gtk-main_window_file_search.c
+src/fs/gnunet-fs-gtk.c
+src/setup/gnunet-setup-transport-http.c
+src/setup/gnunet-setup-transport-udp.c
+src/setup/gnunet-setup-datastore-plugins.c
+src/setup/gnunet-setup-options.c
+src/setup/gnunet-setup.c
+src/setup/gnunet-setup-transport-test.c
+src/setup/gnunet-setup-transport-https.c
+src/setup/gnunet-setup-datacache-plugins.c
+src/setup/gnunet-setup-datastore-config.c
+src/setup/gnunet-setup-datacache-config.c
+src/setup/gnunet-setup-transport-tcp.c
+src/setup/gnunet-setup-transport.c
+src/setup/gnunet-setup-hostlist-editing.c
+src/setup/gnunet-setup-transport-plugins.c
+src/lib/os_installation.c
+src/lib/about.c
+src/lib/glade.c
+src/lib/trayicon.c
+src/lib/eventloop.c
+src/lib/nls.c
+contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
+contrib/gnunet_fs_gtk_search_tab.glade
+contrib/gnunet_fs_gtk_search_dialog.glade
+contrib/gnunet_peerinfo_gtk_about_dialog.glade
+contrib/gnunet_fs_gtk_open_directory_dialog.glade
+contrib/gnunet_setup_gtk_main_window.glade
+contrib/gnunet_fs_gtk_publish_file_dialog.glade
+contrib/gnunet_fs_gtk_download_as_dialog.glade
+contrib/gnunet_setup_about_dialog.glade
+contrib/gnunet_fs_gtk_publish_dialog.glade
+contrib/gnunet_fs_gtk_publish_tab.glade
+contrib/gnunet_gtk_status_bar_menu.glade
+contrib/gnunet_fs_gtk_main_tab_new_frame.glade
+contrib/gnunet_fs_gtk_publish_edit_dialog.glade
+contrib/gnunet_peerinfo_gtk_main_window.glade
+contrib/gnunet_fs_gtk_main_window.glade
+contrib/gnunet_fs_gtk_open_url_dialog.glade
+contrib/gnunet_fs_gtk_create_namespace_dialog.glade
+contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
+contrib/gnunet_fs_gtk_publish_directory_dialog.glade
+contrib/gnunet_fs_gtk_about_dialog.glade
diff --git a/po/da.po b/po/da.po
index 2e81adfc..e0fe558c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2011-06-10 11:26+0200\n"
+"POT-Creation-Date: 2011-09-19 14:26+0200\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,171 +23,552 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/publish_edit_dialog.glade:62
+#: src/peerinfo/gnunet-peerinfo-gtk.c:369
+#, c-format
+msgid "Failed to initialize communication with peerinfo service!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-peerinfo-gtk.c:397 src/fs/gnunet-fs-gtk.c:243
+msgid "start in tray mode"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-common.c:158
+#, c-format
+msgid "Selected file `%s' is not a GNUnet directory!\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:300
+msgid "Metadata wrongly claims that this is a GNUnet directory!\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:781
+#: contrib/gnunet_fs_gtk_main_window.glade:114
+#, fuzzy
+msgid "_Download"
+msgstr "H_ent"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:791
+#, fuzzy
+msgid "_Abort download"
+msgstr "H_ent"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:801
+msgid "_Copy URI to Clipboard"
+msgstr "_Kopier URI til udklipsholderen"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:1267
+#: src/fs/gnunet-fs-gtk-event_handler.c:1444
+#, fuzzy
+msgid "no description supplied"
+msgstr "Samling stoppede.\n"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:1269
+#, fuzzy
+msgid "no URI"
+msgstr "URI"
+
+#: src/fs/gnunet-fs-gtk-edit_publish_dialog.c:639
+#, 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-main_window_file_search.c:108
+#, c-format
+msgid "Invalid keyword string `%s': %s"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:572 src/setup/gnunet-setup-options.c:580
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:591 src/setup/gnunet-setup-options.c:599
+#, c-format
+msgid "`%s' is not a valid port number!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1461
+msgid "Should GNUnet exclusively connect to friends?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1472
+msgid "Friends file containing the list of friendly peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1483
+msgid "Minimum number of friendly connections"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1494
+msgid "Topology should always be loaded"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1506
+msgid "Should hostlist support be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1518
+msgid "Should file-sharing be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1529
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1540
+msgid "Should GNUnet learn about other peers using hostlists"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1551
+msgid "Should GNUnet learn hostlists from other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1562
+msgid "Should this peer offer a hostlist to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1573
+msgid "Should this peer advertise its hostlist to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1584
+msgid "Port this peers hostlist should be offered on"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1603
+msgid "Known hostlist URLs"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1613
+msgid "How many bytes per second are we allowed to transmit?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1624
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1637
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1648
+msgid "Enable communication via UDP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1659
+msgid "Enable communication via HTTP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1670
+msgid "Enable communication via HTTPS"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1681
+msgid "Enable communication via DV"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1692
+msgid "Enable communication via WLAN"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1703
+msgid "Port we bind to for TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1714
+msgid "Port visible to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1725
+msgid "Check if this peer is behind a NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1736
+msgid "Check if the NAT has been hole-punched manually"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1747
+msgid "Enable NAT traversal with UPnP/PMP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1759
+msgid "Enable NAT traversal with ICMP as server"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1771
+msgid "External (public) IP address of the NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1782
+msgid "Enable NAT traversal with ICMP as client"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1793
+msgid "Internal (private) IP address of the NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1804
+msgid "Disable IPv6 support"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1816
+msgid "Port for inbound UDP packets, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1827
+msgid "Port for inbound HTTP connections, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1838
+msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1851
+msgid "Use sqLite to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1862
+msgid "Use MySQL to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1873
+msgid "Use Postgres to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1884 src/setup/gnunet-setup-options.c:2017
+msgid "Name for the MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1895 src/setup/gnunet-setup-options.c:2028
+#, fuzzy
+msgid "Configuration file for MySQL access"
+msgstr "_Konfigurationsfil anvendt for gnunetd:"
+
+#: src/setup/gnunet-setup-options.c:1906 src/setup/gnunet-setup-options.c:2039
+msgid "Username for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1917 src/setup/gnunet-setup-options.c:2050
+msgid "Password for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1928 src/setup/gnunet-setup-options.c:2061
+msgid "Name of host running MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1939 src/setup/gnunet-setup-options.c:2083
+msgid "Port of MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1950 src/setup/gnunet-setup-options.c:2094
+#, fuzzy
+msgid "Configuration for Postgres (passed to PQconnectdb)"
+msgstr "_Konfigurationsfil anvendt for gnunetd:"
+
+#: src/setup/gnunet-setup-options.c:1962
+msgid "Should we try to push our content to other peers?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1973
+msgid "Are we allowed to cache content received from other peers?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1984
+msgid "Use sqLite to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1995
+msgid "Use MySQL to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2006
+msgid "Use Postgres to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2072
+msgid "Name of monitoring interface to use (monX)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2105
+msgid "Name of the virtual interface the GNUnet VPN should create"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2116
+msgid "IPv4 address to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2127
+msgid "IPv4 network mask to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2138
+msgid "IPv6 address to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2149
+msgid "IPv6 network prefix length to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2161
+msgid ""
+"IP address of the virtual DNS server that resolves through GNUnet (use in "
+"resolve.conf if you want to resolve through some GNUnet DNS Exit)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2173
+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:2185
+msgid ""
+"Allow other peers to perform DNS resolutions using your Internet connection"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2197
+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:2208
+msgid "IPv4 address to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2219
+msgid "IPv4 network mask to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2230
+msgid "IPv6 address to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2242
+msgid "IPv6 network prefix length to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2255
+msgid ""
+"Allow other users to use your Internet connection for UDP traffic (via the "
+"Exit interface)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2267
+msgid ""
+"Allow other users to use your Internet connection for TCP traffic (via the "
+"Exit interface)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2281
+msgid "Specification of .gnunet hostnames and services offered by this peer"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:203
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#, c-format
+msgid "Invalid regular expression `%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.c:217
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: src/setup/gnunet-setup.c:228
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:238
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/lib/os_installation.c:287
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/lib/glade.c:81
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Kunne ikke finde håndtering for »%s«\n"
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:30
+#, fuzzy
+msgid "Advertise namespace"
+msgstr "i _navnerum"
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:52
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:62
 #, fuzzy
 msgid "Type:"
 msgstr "_Type:"
 
-#: contrib/publish_edit_dialog.glade:89 contrib/publish_edit_dialog.glade:171
-#: contrib/main-window.glade:397
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:79
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:161
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:89
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:171
+#: contrib/gnunet_fs_gtk_main_window.glade:356
 msgid "Value"
 msgstr "Værdi"
 
-#: contrib/publish_edit_dialog.glade:109
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:99
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:109
 #, fuzzy
 msgid "Value:"
 msgstr "_Værdi:"
 
-#: contrib/publish_edit_dialog.glade:158 contrib/main-window.glade:382
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:148
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:158
+#: contrib/gnunet_fs_gtk_main_window.glade:341
 msgid "Type"
 msgstr "Type"
 
-#: contrib/publish_edit_dialog.glade:236
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:226
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:236
 #, fuzzy
 msgid "Preview:"
 msgstr "_Forhåndsvisning:"
 
-#: contrib/publish_edit_dialog.glade:259
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:247
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:259
 #, fuzzy
 msgid "Select file"
 msgstr "Vælg alle filer"
 
-#: contrib/publish_edit_dialog.glade:291
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:279
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:291
 msgid "_Keyword:"
 msgstr "_Nøgleord:"
 
-#: contrib/publish_edit_dialog.glade:341
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:333
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:341
 msgid "Keywords"
 msgstr "Nøgleord"
 
-#: contrib/publish_edit_dialog.glade:399
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:391
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:399
 msgid "_Normalize"
 msgstr ""
 
-#: contrib/publish_edit_dialog.glade:438
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:430
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:438
 #, fuzzy
 msgid "Options"
 msgstr "Ope_rationer"
 
-#: contrib/publish_edit_dialog.glade:463 contrib/download_as.glade:34
-#: contrib/search_dialog.glade:74 contrib/open_url_dialog.glade:67
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:456
+#: contrib/gnunet_fs_gtk_search_dialog.glade:74
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:34
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:463
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:67
 msgid "_Anonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/publish_edit_dialog.glade:509
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:502
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:509
 #, fuzzy
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: contrib/publish_edit_dialog.glade:554
+# (Jeg tror godt den kan oversættes til rod)
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:546
 #, fuzzy
-msgid "_Index file"
-msgstr "_Identifikation:"
+msgid "_Root:"
+msgstr "_Rod (root):"
 
-#: contrib/publish_edit_dialog.glade:601
-msgid "_Expriation year:"
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:560
+msgid "root"
 msgstr ""
 
-#: contrib/download_as.glade:15
-msgid "Save file as..."
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:586
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:601
+msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/download_as.glade:61
-#, fuzzy
-msgid "_recursive"
-msgstr "r_ekursivt"
+#: contrib/gnunet_fs_gtk_search_tab.glade:59
+#: contrib/gnunet_fs_gtk_search_dialog.glade:157
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: contrib/gnunet_fs_gtk_search_tab.glade:78
+msgid "Format"
+msgstr "Format"
+
+#: contrib/gnunet_fs_gtk_search_tab.glade:95
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:101
+#: contrib/gnunet_fs_gtk_publish_tab.glade:41
+msgid "Size"
+msgstr "Størrelse"
+
+#: contrib/gnunet_fs_gtk_search_tab.glade:130
+#: contrib/gnunet_fs_gtk_main_window.glade:211
+msgid "Preview"
+msgstr "Forhåndsvis"
+
+#: contrib/gnunet_fs_gtk_search_tab.glade:154
+msgid "query"
+msgstr ""
 
-#: contrib/search_dialog.glade:27
+#: contrib/gnunet_fs_gtk_search_dialog.glade:27
 #, fuzzy
 msgid "Search GNUnet"
 msgstr "Søgeresultater"
 
-#: contrib/search_dialog.glade:45
+#: contrib/gnunet_fs_gtk_search_dialog.glade:45
 msgid "_Query:"
 msgstr ""
 
-#: contrib/search_dialog.glade:64 contrib/open_url_dialog.glade:56
+#: contrib/gnunet_fs_gtk_search_dialog.glade:64
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:56
 msgid ""
 "Separate multiple keywords with spaces, prefix mandatory keywords with \"+\""
 msgstr ""
 
-#: contrib/search_dialog.glade:130
+#: contrib/gnunet_fs_gtk_search_dialog.glade:130
+#: contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade:44
 msgid "Name"
 msgstr "Navn"
 
 # (Jeg tror godt den kan oversættes til rod)
-#: contrib/search_dialog.glade:145
+#: contrib/gnunet_fs_gtk_search_dialog.glade:145
 #, fuzzy
 msgid "Root"
 msgstr "_Rod (root):"
 
-#: contrib/search_dialog.glade:157 contrib/search_tab.glade:59
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: contrib/publish_dialog.glade:68
-#, fuzzy
-msgid "Publish content on GNUnet"
-msgstr "Udgiv en fil til GNUnet"
-
-#: contrib/publish_dialog.glade:101 contrib/search_tab.glade:95
-#: contrib/publish_tab.glade:41
-msgid "Size"
-msgstr "Størrelse"
-
-#: contrib/publish_dialog.glade:114 contrib/publish_tab.glade:26
-msgid "Filename"
-msgstr "Filnavn"
-
-#: contrib/publish_dialog.glade:359
-msgid "Pseudonym"
-msgstr ""
-
-#: contrib/publish_dialog.glade:375
-#, fuzzy
-msgid "Current identifier"
-msgstr "Næste identifikation"
-
-#: contrib/publish_dialog.glade:393
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 #, fuzzy
-msgid "Update identifier"
-msgstr "Næste identifikation"
+msgid "About gnunet-peerinfo-gtk"
+msgstr "Om gnunet-gtk"
 
-#: contrib/publish_dialog.glade:407
-msgid "Description (of existing content)"
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:17
+#: contrib/gnunet_setup_about_dialog.glade:17
+msgid "(C) 2011 The GNUnet Project"
 msgstr ""
 
-#: contrib/open_url_dialog.glade:19
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:19
+#: contrib/gnunet_setup_about_dialog.glade:19
+#: contrib/gnunet_fs_gtk_about_dialog.glade:19
 #, fuzzy
-msgid "Download from URI"
-msgstr "H_ent"
-
-#: contrib/open_url_dialog.glade:37
-#, fuzzy
-msgid "_URI:"
-msgstr "URI"
-
-#: contrib/search_tab.glade:78
-msgid "Format"
-msgstr "Format"
-
-#: contrib/search_tab.glade:130 contrib/main-window.glade:256
-msgid "Preview"
-msgstr "Forhåndsvis"
-
-#: contrib/search_tab.glade:154
-msgid "query"
-msgstr ""
-
-#: contrib/about.glade:7
-msgid "About gnunet-gtk"
-msgstr "Om gnunet-gtk"
+msgid "GNUnet: GNU's Framework for Secure P2P Networking"
+msgstr "GNUnet, GNU's modpartsnetværk"
 
-#: contrib/about.glade:17
-msgid "(C) 2010 The GNUnet Project"
-msgstr ""
-
-#: contrib/about.glade:19
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:20
+#: contrib/gnunet_setup_about_dialog.glade:20
+#: contrib/gnunet_fs_gtk_about_dialog.glade:20
 msgid ""
 "                    GNU GENERAL PUBLIC LICENSE\n"
 "                       Version 2, June 1991\n"
@@ -760,7 +1141,9 @@ msgstr ""
 "                     END OF TERMS AND CONDITIONS\n"
 
 #. TRANSLATORS: Replace this string with your names, one name per line.
-#: contrib/about.glade:332
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:338
+#: contrib/gnunet_setup_about_dialog.glade:338
+#: contrib/gnunet_fs_gtk_about_dialog.glade:338
 msgid ""
 "Di Ma\n"
 "Jens Palsberg <palsberg@cs.ucla.edu>\n"
@@ -791,226 +1174,825 @@ msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
 "Joe Hansen <joedalton2@yahoo.dk>\n"
 
-#: contrib/main-window.glade:60
+#: contrib/gnunet_setup_gtk_main_window.glade:22
 #, fuzzy
-msgid "gnunet-gtk"
+msgid "gnunet-setup"
 msgstr "Om gnunet-gtk"
 
-#: contrib/main-window.glade:76
-#, fuzzy
-msgid "_File sharing"
-msgstr "Filde_ling"
+#: contrib/gnunet_setup_gtk_main_window.glade:115
+msgid "Services:"
+msgstr ""
 
-#: contrib/main-window.glade:83
-msgid "_Create pseudonym"
+#: contrib/gnunet_setup_gtk_main_window.glade:126
+msgid "Topology"
 msgstr ""
 
-#: contrib/main-window.glade:85
-msgid ""
-"Create a pseudonym for publishing content.  Note that you can also publish "
-"content anonymously (without using a pseudonym)."
+#: contrib/gnunet_setup_gtk_main_window.glade:145
+msgid "Hostlist"
 msgstr ""
 
-#: contrib/main-window.glade:97
-msgid "_Advertise Pseudonym"
+#: contrib/gnunet_setup_gtk_main_window.glade:163
+#, fuzzy
+msgid "File _Sharing"
+msgstr "Filde_ling"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:182
+#: contrib/gnunet_setup_gtk_main_window.glade:4163
+msgid "_VPN"
 msgstr ""
 
-#: contrib/main-window.glade:108
+#: contrib/gnunet_setup_gtk_main_window.glade:205
 #, fuzzy
-msgid "_Publish"
-msgstr "Udgi_v"
+msgid "<b>Service Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/main-window.glade:110
+#: contrib/gnunet_setup_gtk_main_window.glade:234
 #, fuzzy
-msgid "Publish files or directories on GNUnet"
-msgstr "Udgiv en fil til GNUnet"
+msgid "F_2F only"
+msgstr "K_un fil"
 
-#: contrib/main-window.glade:128 contrib/main-window.glade:304
+#: contrib/gnunet_setup_gtk_main_window.glade:265
 #, fuzzy
-msgid "_Search"
-msgstr "S_øg"
+msgid "Friends file:"
+msgstr "Inde_ks"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:300
+msgid "Min. connected friends:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:335
+msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:368
+msgid "Use Hostlists to bootstrap"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:385
+msgid "Learn Servers from P2P Network"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:417
+msgid "Run Hostlist Server"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:433
+msgid "Advertise Hostlist Server"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:455
+#: contrib/gnunet_setup_gtk_main_window.glade:2597
+#: contrib/gnunet_setup_gtk_main_window.glade:3215
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:507
+msgid "Known Hostlist Servers:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:534
+msgid "URL"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:581
+msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
+msgstr ""
 
-#: contrib/main-window.glade:130
+# Det plejer at være _Generelt (måske navnet på en menu)
+#: contrib/gnunet_setup_gtk_main_window.glade:599
+msgid "_General"
+msgstr "_Generelt"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:633
+msgid "Max. download bandwidth (B/s):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:665
+msgid "Max. upload bandwidth (B/s)"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:707
 #, fuzzy
-msgid "Search GNUnet for files"
-msgstr "Vælg GNUnet-mappefil der skal åbnes"
+msgid "<b>Bandwidth Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/main-window.glade:148 src/fs_event_handler.c:866
+#: contrib/gnunet_setup_gtk_main_window.glade:739
+msgid "Peer is behind _NAT"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:743
+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:758
 #, fuzzy
-msgid "_Download"
-msgstr "H_ent"
+msgid "Attempt automatic configuration"
+msgstr "Start konfigurationsgu_iden"
 
-#: contrib/main-window.glade:150
-msgid "Download a file or directory with a known URI."
+#: contrib/gnunet_setup_gtk_main_window.glade:774
+msgid "Disable IPv_6 support"
 msgstr ""
 
-#: contrib/main-window.glade:162
+#: contrib/gnunet_setup_gtk_main_window.glade:778
+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:822
+msgid "NAT has been hole-punched manually"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:826
+msgid ""
+"Set this option if you have configured your NAT to forward the ports for the "
+"various enabled GNUnet transports.  If the external ports are different, the "
+"respective values of the external port should be specified under "
+"\"advertised port\" for the respective transport. You also need to specify "
+"the \"External (public) IPv4 address\" of your NAT box below."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:839
+msgid "Enable NAT traversal via UPnP or PMP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:843
+msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:856
+msgid "Enable NAT traversal using ICMP method"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:860
+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:879
+msgid ""
+"Globally visible IP address of your system (IP address of the external "
+"interface of your NAT).  You can also specify a hostname, in which case "
+"GNUnet will periodically look up the hostname in DNS to determine our "
+"external IP address (DynDNS setup)."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:880
+msgid "External (public) IPv4 address:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:917
+msgid "Enable connecting to NATed peers using ICMP method"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:921
+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:941
+msgid ""
+"Specify the IPv4 address of your computers main network interface (typically "
+"eth0 or wlan0)."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:942
+msgid "Internal (private) IPv4 address:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:999
 #, fuzzy
-msgid "_Open GNUnet directory"
-msgstr "Åbn en GNUnet-mappe fra en fil"
+msgid "<b>NAT Traversal Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/main-window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:1020
+msgid "_Network"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1052
+msgid "Plugins to use:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1063
+msgid "_TCP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1083
+msgid "_UDP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1102
+msgid "_HTTP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1122
+msgid "HTTP_S"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1142
+msgid "D_V"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1161
+msgid "_WLAN"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1202
+#: contrib/gnunet_setup_gtk_main_window.glade:1413
+#: contrib/gnunet_setup_gtk_main_window.glade:1623
+#: contrib/gnunet_setup_gtk_main_window.glade:1835
+msgid "Bind to port:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1236
+msgid "Use Port \"0\" to only allow outgoing TCP connections"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1261
+#: contrib/gnunet_setup_gtk_main_window.glade:1463
+#: contrib/gnunet_setup_gtk_main_window.glade:1673
+#: contrib/gnunet_setup_gtk_main_window.glade:1885
+msgid "Advertised port:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1295
+#: contrib/gnunet_setup_gtk_main_window.glade:1495
+#: contrib/gnunet_setup_gtk_main_window.glade:1707
+#: contrib/gnunet_setup_gtk_main_window.glade:1919
 msgid ""
-"Use this option to browse a GNUnet directory file that has been previously "
-"downloaded."
+"External port visible on our public IP address after mappings by NAT/"
+"firewalls"
 msgstr ""
 
-#: contrib/main-window.glade:184
+#: contrib/gnunet_setup_gtk_main_window.glade:1328
+#: contrib/gnunet_setup_gtk_main_window.glade:1529
+#: contrib/gnunet_setup_gtk_main_window.glade:1741
+#: contrib/gnunet_setup_gtk_main_window.glade:1953
+#, fuzzy
+msgid "Test configuration"
+msgstr "_Avanceret konfiguration"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1345
+#: contrib/gnunet_setup_gtk_main_window.glade:1546
+#: contrib/gnunet_setup_gtk_main_window.glade:1758
+#: contrib/gnunet_setup_gtk_main_window.glade:1970
+#: contrib/gnunet_setup_gtk_main_window.glade:2681
+#: contrib/gnunet_setup_gtk_main_window.glade:2792
+#: contrib/gnunet_setup_gtk_main_window.glade:3299
+#: contrib/gnunet_setup_gtk_main_window.glade:3411
+msgid "Configuration works!"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1358
+#: contrib/gnunet_setup_gtk_main_window.glade:1559
+#: contrib/gnunet_setup_gtk_main_window.glade:1771
+#: contrib/gnunet_setup_gtk_main_window.glade:1983
+msgid "Test failed!"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1393
+msgid "TCP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1412
+#: contrib/gnunet_setup_gtk_main_window.glade:1622
+#: contrib/gnunet_setup_gtk_main_window.glade:1834
 msgid ""
-"Exit gnunet-gtk.  Active file-sharing operations will resume upon restart."
+"Port number that GNUnet's UDP transport should bind to on the local system"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1600
+msgid "UDP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1812
+msgid "HTTP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2024
+msgid "HTTPS"
 msgstr ""
 
-#: contrib/main-window.glade:200
+#: contrib/gnunet_setup_gtk_main_window.glade:2047
+msgid "DV"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2066
+msgid "Name of _Monitor Interface"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2115
+msgid "WLAN"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2137
 #, fuzzy
-msgid "_Edit"
-msgstr "_Afslut"
+msgid "<b>Transport Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/main-window.glade:209
+#: contrib/gnunet_setup_gtk_main_window.glade:2150
+msgid "_Transports"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2179
+msgid "Enable unsolicited content transmission from this peer"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2197
+msgid "Enable caching content at this peer"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2220
 #, fuzzy
-msgid "Edit the system configuration."
+msgid "<b>File Sharing Options</b>"
+msgstr "<b>Kørende programmer</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2254
+msgid "Database Backend to use:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2270
+#: contrib/gnunet_setup_gtk_main_window.glade:2396
+#: contrib/gnunet_setup_gtk_main_window.glade:2884
+#: contrib/gnunet_setup_gtk_main_window.glade:3010
+msgid "sqLite"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2288
+#: contrib/gnunet_setup_gtk_main_window.glade:2647
+#: contrib/gnunet_setup_gtk_main_window.glade:2902
+#: contrib/gnunet_setup_gtk_main_window.glade:3265
+msgid "MySQL"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2307
+#: contrib/gnunet_setup_gtk_main_window.glade:2758
+#: contrib/gnunet_setup_gtk_main_window.glade:2921
+#: contrib/gnunet_setup_gtk_main_window.glade:3377
+#, fuzzy
+msgid "Postgres"
+msgstr "Fremgang"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2346
+#: contrib/gnunet_setup_gtk_main_window.glade:2960
+msgid "Quota (bytes):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2389
+#: contrib/gnunet_setup_gtk_main_window.glade:3003
+msgid "No setup required."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2414
+#: contrib/gnunet_setup_gtk_main_window.glade:3028
+msgid "MySQL database name:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2428
+#: contrib/gnunet_setup_gtk_main_window.glade:3042
+#, fuzzy
+msgid "gnunet"
+msgstr "Om gnunet-gtk"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2458
+#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#, fuzzy
+msgid "Configuration file:"
+msgstr "_Konfigurationsfil anvendt for gnunetd:"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2493
+#: contrib/gnunet_setup_gtk_main_window.glade:3108
+#, fuzzy
+msgid "Username:"
+msgstr "_Filnavn:"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2524
+#: contrib/gnunet_setup_gtk_main_window.glade:3140
+msgid "Password:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2565
+#: contrib/gnunet_setup_gtk_main_window.glade:3182
+msgid "MySQL Server Hostname:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2579
+#: contrib/gnunet_setup_gtk_main_window.glade:3196
+msgid "localhost"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2667
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#, fuzzy
+msgid "Test datastore configuration"
 msgstr "Start konfigurationsgu_iden"
 
-#: contrib/main-window.glade:224
-msgid "_View"
+#: contrib/gnunet_setup_gtk_main_window.glade:2693
+#: contrib/gnunet_setup_gtk_main_window.glade:2804
+#: contrib/gnunet_setup_gtk_main_window.glade:3311
+#: contrib/gnunet_setup_gtk_main_window.glade:3423
+msgid "Configuration error!"
 msgstr ""
 
-#: contrib/main-window.glade:232
-msgid "Show meta data in main window"
+#: contrib/gnunet_setup_gtk_main_window.glade:2716
+#: contrib/gnunet_setup_gtk_main_window.glade:3334
+#, fuzzy
+msgid "Configuration:"
+msgstr "_Avanceret konfiguration"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2730
+#: contrib/gnunet_setup_gtk_main_window.glade:3348
+msgid "connect_timeout=10; dbname=gnunet"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2834
+msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/main-window.glade:234
+#: contrib/gnunet_setup_gtk_main_window.glade:2868
+msgid "Datacache:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3285
+#: contrib/gnunet_setup_gtk_main_window.glade:3397
 #, fuzzy
-msgid "Metadata"
-msgstr "Metadata"
+msgid "Test datacache configuration"
+msgstr "_Avanceret konfiguration"
 
-#: contrib/main-window.glade:243
-msgid "Activates the panel showing information about known and connected peers"
+#: contrib/gnunet_setup_gtk_main_window.glade:3453
+msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/main-window.glade:245
+#: contrib/gnunet_setup_gtk_main_window.glade:3473
 #, fuzzy
-msgid "Neighbours"
-msgstr "timer"
+msgid "_File Sharing"
+msgstr "Filde_ling"
 
-#: contrib/main-window.glade:254
-msgid "Show preview (when available)"
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
+msgid "Master _interface name:"
 msgstr ""
 
-#: contrib/main-window.glade:270
-msgid "_Help"
+#: contrib/gnunet_setup_gtk_main_window.glade:3549
+msgid "IPv4 address for Master interface:"
 msgstr ""
 
-#: contrib/main-window.glade:279
-msgid "Display information about this version of gnunet-gtk"
+#: contrib/gnunet_setup_gtk_main_window.glade:3578
+#: contrib/gnunet_setup_gtk_main_window.glade:3646
+#: contrib/gnunet_setup_gtk_main_window.glade:3907
+#: contrib/gnunet_setup_gtk_main_window.glade:3975
+msgid "/"
 msgstr ""
 
-#: contrib/main-window.glade:353
-msgid "Thumbnail associated with the currently selected content"
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
+msgid "IPv6 address for Master interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3686
+msgid "Virtual DNS Server:"
 msgstr ""
 
-#: contrib/main-window.glade:441
+#: contrib/gnunet_setup_gtk_main_window.glade:3726
 #, fuzzy
-msgid "Peer"
-msgstr "_Modparter"
+msgid "<b>VPN Master Interface Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
 
-#: contrib/main-window.glade:460
-msgid "Bandwidth"
-msgstr "Båndbredde"
+#: contrib/gnunet_setup_gtk_main_window.glade:3744
+msgid "Enable VPN Exit"
+msgstr ""
 
-#: contrib/main-window.glade:474
-msgid "Country"
-msgstr "Land"
+#: contrib/gnunet_setup_gtk_main_window.glade:3761
+msgid "Enable DNS Exit"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3806
+msgid "Exit interface name: "
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3833
+msgid "Enable UDP Exit"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3849
+msgid "Enable TCP exit"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3878
+msgid "IPv4 address for Exit interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3946
+msgid "IPv6 address for Exit interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4015
+#, fuzzy
+msgid "<b>GNUnet VPN Exit Interface</b>"
+msgstr "<b>GNUnet dæmonkontrol</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
+#, fuzzy
+msgid "DNS name"
+msgstr "Kaldenavn"
 
-#: contrib/publish-file-dialog.glade:8
+#: contrib/gnunet_setup_gtk_main_window.glade:4075
+msgid "Prot."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4089
+msgid "Source Port"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4103
+#, fuzzy
+msgid "Destination"
+msgstr "Beskrivelse"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4142
+#, fuzzy
+msgid "<b>DNS Services Configuration</b>"
+msgstr "<n>GNUnet dæmonkonfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4180
+msgid "Welcome to gnunet-setup."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:8
 #, fuzzy
 msgid "Publish file..."
 msgstr "Udgivet filnavn"
 
-#: contrib/publish-file-dialog.glade:25
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Index file"
 msgstr "Inde_ks"
 
-#: contrib/publish-file-dialog.glade:47
-#: contrib/publish-directory-dialog.glade:66
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:47
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:66
 #, fuzzy
 msgid "Priority:"
 msgstr "_Prioritet:"
 
-#: contrib/publish-file-dialog.glade:82
-#: contrib/publish-directory-dialog.glade:101
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:82
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:101
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/publish-file-dialog.glade:108
-#: contrib/publish-directory-dialog.glade:126
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:108
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:126
 #, fuzzy
 msgid "Anonymity:"
 msgstr "_Anonymitet:"
 
-#: contrib/publish_tab.glade:65
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:15
+msgid "Save file as..."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:61
+#, fuzzy
+msgid "_recursive"
+msgstr "r_ekursivt"
+
+#: contrib/gnunet_setup_about_dialog.glade:8
+#, fuzzy
+msgid "About gnunet-setup"
+msgstr "Om gnunet-gtk"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:68
 #, fuzzy
-msgid "filename"
+msgid "Publish content on GNUnet"
+msgstr "Udgiv en fil til GNUnet"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:114
+#: contrib/gnunet_fs_gtk_publish_tab.glade:26
+msgid "Filename"
 msgstr "Filnavn"
 
-#: contrib/status_bar_menu.glade:11
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:359
+msgid "Pseudonym"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:375
+#, fuzzy
+msgid "Current identifier"
+msgstr "Næste identifikation"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:393
+#, fuzzy
+msgid "Update identifier"
+msgstr "Næste identifikation"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:407
+msgid "Description (of existing content)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:65
+#, fuzzy
+msgid "Publishing"
+msgstr "Udgi_v"
+
+#: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
 msgstr "_Afslut"
 
-#: contrib/publish-directory-dialog.glade:44
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:554
 #, fuzzy
-msgid "Index files"
-msgstr "Inde_ks"
+msgid "_Index file"
+msgstr "_Identifikation:"
 
-#: src/gnunet-gtk.c:388
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "Kunne ikke finde håndtering for »%s«\n"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:25
+#, fuzzy
+msgid "gnunet-gtk"
+msgstr "Om gnunet-gtk"
 
-#: src/gnunet-gtk.c:643
-msgid "start in tray mode"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:44
+#: contrib/gnunet_fs_gtk_main_window.glade:225
+msgid "_Help"
 msgstr ""
 
-#: src/fs_event_handler.c:313
-msgid "Metadata wrongly claims that this is a GNUnet directory!\n"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:55
+msgid "Display information about this version of gnunet-gtk"
 msgstr ""
 
-#: src/fs_event_handler.c:878
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:95
 #, fuzzy
-msgid "_Abort download"
-msgstr "H_ent"
+msgid "Peer"
+msgstr "_Modparter"
 
-#: src/fs_event_handler.c:890
-msgid "_Copy URI to Clipboard"
-msgstr "_Kopier URI til udklipsholderen"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:112
+msgid "In"
+msgstr ""
 
-#: src/fs_event_handler.c:1377 src/fs_event_handler.c:1577
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:128
+msgid "Out"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:143
+msgid "Country"
+msgstr "Land"
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:159
 #, fuzzy
-msgid "no description supplied"
-msgstr "Samling stoppede.\n"
+msgid "Addresses"
+msgstr "Adresse"
 
-#: src/fs_event_handler.c:1379
+#: contrib/gnunet_fs_gtk_main_window.glade:26
 #, fuzzy
-msgid "no URI"
+msgid "gnunet-fs-gtk"
+msgstr "Om gnunet-gtk"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:42
+#, fuzzy
+msgid "_File sharing"
+msgstr "Filde_ling"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:49
+msgid "_Create pseudonym"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:51
+msgid ""
+"Create a pseudonym for publishing content.  Note that you can also publish "
+"content anonymously (without using a pseudonym)."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:63
+msgid "_Advertise Pseudonym"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:74
+#, fuzzy
+msgid "_Publish"
+msgstr "Udgi_v"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:76
+#, fuzzy
+msgid "Publish files or directories on GNUnet"
+msgstr "Udgiv en fil til GNUnet"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:260
+#, fuzzy
+msgid "_Search"
+msgstr "S_øg"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:96
+#, fuzzy
+msgid "Search GNUnet for files"
+msgstr "Vælg GNUnet-mappefil der skal åbnes"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:116
+msgid "Download a file or directory with a known URI."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:128
+#, fuzzy
+msgid "_Open GNUnet directory"
+msgstr "Åbn en GNUnet-mappe fra en fil"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:130
+msgid ""
+"Use this option to browse a GNUnet directory file that has been previously "
+"downloaded."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:150
+msgid ""
+"Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#, fuzzy
+msgid "_Edit"
+msgstr "_Afslut"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:175
+#, fuzzy
+msgid "Edit the system configuration."
+msgstr "Start konfigurationsgu_iden"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:190
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:198
+msgid "Show meta data in main window"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:200
+#, fuzzy
+msgid "Metadata"
+msgstr "Metadata"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:209
+msgid "Show preview (when available)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:234
+msgid "Display information about this version of gnunet-fs-gtk"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+msgid "Thumbnail associated with the currently selected content"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:19
+#, fuzzy
+msgid "Download from URI"
+msgstr "H_ent"
+
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#, fuzzy
+msgid "_URI:"
 msgstr "URI"
 
-#: src/edit_publish_dialog.c:646
-#, fuzzy, c-format
-msgid "Could not load preview `%s' into memory\n"
-msgstr "Fejl under kortlægning af fil »%s« til hukommelsen."
+#: contrib/gnunet_fs_gtk_create_namespace_dialog.glade:9
+#, fuzzy
+msgid "Create namespace"
+msgstr "Opret navnerum"
 
-#: src/common.c:173
-#, c-format
-msgid "Selected file `%s' is not a GNUnet directory!\n"
+#: contrib/gnunet_fs_gtk_create_namespace_dialog.glade:27
+#, fuzzy
+msgid "_Name:"
+msgstr "Navn"
+
+#: contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade:19
+msgid "Select pseudonym..."
 msgstr ""
 
-#: src/main_window_file_search.c:114
-#, c-format
-msgid "Invalid keyword string `%s': %s"
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:44
+#, fuzzy
+msgid "Index files"
+msgstr "Inde_ks"
+
+#: contrib/gnunet_fs_gtk_about_dialog.glade:8
+#, fuzzy
+msgid "About gnunet-fs-gtk"
+msgstr "Om gnunet-gtk"
+
+#: contrib/gnunet_fs_gtk_about_dialog.glade:17
+msgid "(C) 2010,2011 The GNUnet Project"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Neighbours"
+#~ msgstr "timer"
+
+#~ msgid "Bandwidth"
+#~ msgstr "Båndbredde"
+
+#, fuzzy
+#~ msgid "filename"
+#~ msgstr "Filnavn"
+
+#, fuzzy
 #~ msgid "_Anonymity"
 #~ msgstr "_Anonymitet:"
 
@@ -1055,9 +2037,6 @@ msgstr ""
 #~ msgid "GNU's peer-to-peer network"
 #~ msgstr "GNU's modpartsnetværk"
 
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
 #~ msgid "Status"
 #~ msgstr "Status"
 
@@ -1067,18 +2046,12 @@ msgstr ""
 #~ msgid "anonymous"
 #~ msgstr "anonym"
 
-#~ msgid "Nickname"
-#~ msgstr "Kaldenavn"
-
 #~ msgid "Unhandled (unknown) FSUI event: %u.\n"
 #~ msgstr "Ubehandlet (ukendt) FSUI-begivenhed: %u.\n"
 
 #~ msgid "globally"
 #~ msgstr "globalt"
 
-#~ msgid "Progress"
-#~ msgstr "Fremgang"
-
 #~ msgid "Aborted."
 #~ msgstr "Afbrudt."
 
@@ -1353,9 +2326,6 @@ msgstr ""
 #~ msgid "GNUnet - Daemon not running"
 #~ msgstr "GNUnet - dæmon kører ikke"
 
-#~ msgid "WARNING: Failed to obtain connection statistics from gnunetd.\n"
-#~ msgstr "Advarsel: Kunne ikke hente forbindelsesstatistik fra gnunetd.\n"
-
 #~ msgid "Unknown status"
 #~ msgstr "Ukendt status"
 
@@ -1365,9 +2335,6 @@ msgstr ""
 #~ msgid "Could not send notification via libnotify\n"
 #~ msgstr "Kunne ikke sende besked via libnotify\n"
 
-#~ msgid "GNUnet, GNU's Peer-to-Peer Network"
-#~ msgstr "GNUnet, GNU's modpartsnetværk"
-
 #~ msgid "Show credits"
 #~ msgstr "Vis bidragydere"
 
@@ -1520,27 +2487,12 @@ msgstr ""
 #~ msgid "Sto_p gnunetd"
 #~ msgstr "Sto_p gnunetd"
 
-#~ msgid "<b>GNUnet Daemon Control</b>"
-#~ msgstr "<b>GNUnet dæmonkontrol</b>"
-
-#~ msgid "<b>Running Applications</b>"
-#~ msgstr "<b>Kørende programmer</b>"
-
 #~ msgid "Run gnunet-setup in wizard mode"
 #~ msgstr "Kør gnunet-setup i guidetilstand"
 
 #~ msgid "Run gnunet-setup in standard configuration mode"
 #~ msgstr "Kør gnunet-setup i standardkonfigurationstilstand"
 
-#~ msgid "_Advanced configuration"
-#~ msgstr "_Avanceret konfiguration"
-
-#~ msgid "<b>GNUnet Daemon Configuration</b>"
-#~ msgstr "<n>GNUnet dæmonkonfiguration</b>"
-
-#~ msgid "_Configuration file used for gnunetd:"
-#~ msgstr "_Konfigurationsfil anvendt for gnunetd:"
-
 #~ msgid "Specify the location of \"gnunetd.conf\" here"
 #~ msgstr "Angiv her placeringen af »gnunetd.conf«"
 
@@ -1550,10 +2502,6 @@ msgstr ""
 #~ msgid "gtk-edit"
 #~ msgstr "gtk-edit"
 
-# Det plejer at være _Generelt (måske navnet på en menu)
-#~ msgid "_General"
-#~ msgstr "_Generelt"
-
 #~ msgid ""
 #~ "Search GNUnet for content under the specified keyword (and, if "
 #~ "applicable, restrict the search to the given namespace)"
@@ -1574,9 +2522,6 @@ msgstr ""
 #~ "Angiv anonymitetsniveauet for søgningen, 0 for ingen anonymitet. Højere "
 #~ "værdier giver mere privatliv men også dårligere ydelse."
 
-#~ msgid "in _namespace"
-#~ msgstr "i _navnerum"
-
 #~ msgid ""
 #~ "This is the rating that you have given this namespace so far.  Ratings "
 #~ "are private and not shared with other users in any way.  They are "
@@ -1699,9 +2644,6 @@ msgstr ""
 #~ "Del den angivne fil med valgte indstillinger (du vil så blive spurgt om "
 #~ "at indtaste metadata og nøgleord)"
 
-#~ msgid "_Filename:"
-#~ msgstr "_Filnavn:"
-
 #~ msgid "Browse local computer for files (or directories) to publish"
 #~ msgstr "Gennemse lokal computer for filer (eller mapper) der skal udgives"
 
@@ -1711,9 +2653,6 @@ msgstr ""
 #~ msgid "Only publish a single file"
 #~ msgstr "Udgiv kun en enkelt fil"
 
-#~ msgid "File onl_y"
-#~ msgstr "K_un fil"
-
 #~ msgid ""
 #~ "Controls if GNUnet should (automatically) extract metadata for files.  If "
 #~ "unchecked, the default metadata for the upload will only contain the "
@@ -1999,9 +2938,6 @@ msgstr ""
 #~ msgid "Select this file (or directory) for the publication."
 #~ msgstr "Vælg denne fil (eller mappe) til udgivelse."
 
-#~ msgid "Create Namespace"
-#~ msgstr "Opret navnerum"
-
 #~ msgid "Please provide information about the namespace:"
 #~ msgstr "Giv venligst information om navnerummet:"
 
diff --git a/po/de.po b/po/de.po
index f8bd67c1..0c0e3dfa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2011-06-10 11:26+0200\n"
+"POT-Creation-Date: 2011-09-19 14:26+0200\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,171 +18,550 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: contrib/publish_edit_dialog.glade:62
+#: src/peerinfo/gnunet-peerinfo-gtk.c:369
+#, fuzzy, c-format
+msgid "Failed to initialize communication with peerinfo service!\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/peerinfo/gnunet-peerinfo-gtk.c:397 src/fs/gnunet-fs-gtk.c:243
+msgid "start in tray mode"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-common.c:158
+#, fuzzy, c-format
+msgid "Selected file `%s' is not a GNUnet directory!\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:300
+msgid "Metadata wrongly claims that this is a GNUnet directory!\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:781
+#: contrib/gnunet_fs_gtk_main_window.glade:114
+#, fuzzy
+msgid "_Download"
+msgstr "Downl_oad"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:791
+#, fuzzy
+msgid "_Abort download"
+msgstr "Downl_oad"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:801
+msgid "_Copy URI to Clipboard"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:1267
+#: src/fs/gnunet-fs-gtk-event_handler.c:1444
+#, fuzzy
+msgid "no description supplied"
+msgstr "Keine Kommandos angegeben.\n"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:1269
+#, fuzzy
+msgid "no URI"
+msgstr "URI"
+
+#: src/fs/gnunet-fs-gtk-edit_publish_dialog.c:639
+#, 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-main_window_file_search.c:108
+#, fuzzy, c-format
+msgid "Invalid keyword string `%s': %s"
+msgstr "Ungültige Antwort auf `%s' von `%s'\n"
+
+#: src/setup/gnunet-setup-options.c:572 src/setup/gnunet-setup-options.c:580
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:591 src/setup/gnunet-setup-options.c:599
+#, 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:1461
+msgid "Should GNUnet exclusively connect to friends?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1472
+msgid "Friends file containing the list of friendly peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1483
+msgid "Minimum number of friendly connections"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1494
+msgid "Topology should always be loaded"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1506
+msgid "Should hostlist support be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1518
+msgid "Should file-sharing be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1529
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1540
+msgid "Should GNUnet learn about other peers using hostlists"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1551
+msgid "Should GNUnet learn hostlists from other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1562
+msgid "Should this peer offer a hostlist to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1573
+msgid "Should this peer advertise its hostlist to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1584
+msgid "Port this peers hostlist should be offered on"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1603
+msgid "Known hostlist URLs"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1613
+msgid "How many bytes per second are we allowed to transmit?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1624
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1637
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1648
+msgid "Enable communication via UDP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1659
+msgid "Enable communication via HTTP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1670
+msgid "Enable communication via HTTPS"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1681
+msgid "Enable communication via DV"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1692
+msgid "Enable communication via WLAN"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1703
+msgid "Port we bind to for TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1714
+msgid "Port visible to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1725
+msgid "Check if this peer is behind a NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1736
+msgid "Check if the NAT has been hole-punched manually"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1747
+msgid "Enable NAT traversal with UPnP/PMP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1759
+msgid "Enable NAT traversal with ICMP as server"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1771
+msgid "External (public) IP address of the NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1782
+msgid "Enable NAT traversal with ICMP as client"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1793
+msgid "Internal (private) IP address of the NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1804
+msgid "Disable IPv6 support"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1816
+msgid "Port for inbound UDP packets, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1827
+msgid "Port for inbound HTTP connections, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1838
+msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1851
+msgid "Use sqLite to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1862
+msgid "Use MySQL to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1873
+msgid "Use Postgres to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1884 src/setup/gnunet-setup-options.c:2017
+msgid "Name for the MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1895 src/setup/gnunet-setup-options.c:2028
+msgid "Configuration file for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1906 src/setup/gnunet-setup-options.c:2039
+msgid "Username for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1917 src/setup/gnunet-setup-options.c:2050
+msgid "Password for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1928 src/setup/gnunet-setup-options.c:2061
+msgid "Name of host running MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1939 src/setup/gnunet-setup-options.c:2083
+msgid "Port of MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1950 src/setup/gnunet-setup-options.c:2094
+msgid "Configuration for Postgres (passed to PQconnectdb)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1962
+msgid "Should we try to push our content to other peers?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1973
+msgid "Are we allowed to cache content received from other peers?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1984
+msgid "Use sqLite to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1995
+msgid "Use MySQL to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2006
+msgid "Use Postgres to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2072
+msgid "Name of monitoring interface to use (monX)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2105
+msgid "Name of the virtual interface the GNUnet VPN should create"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2116
+msgid "IPv4 address to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2127
+msgid "IPv4 network mask to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2138
+msgid "IPv6 address to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2149
+msgid "IPv6 network prefix length to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2161
+msgid ""
+"IP address of the virtual DNS server that resolves through GNUnet (use in "
+"resolve.conf if you want to resolve through some GNUnet DNS Exit)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2173
+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:2185
+msgid ""
+"Allow other peers to perform DNS resolutions using your Internet connection"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2197
+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:2208
+msgid "IPv4 address to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2219
+msgid "IPv4 network mask to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2230
+msgid "IPv6 address to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2242
+msgid "IPv6 network prefix length to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2255
+msgid ""
+"Allow other users to use your Internet connection for UDP traffic (via the "
+"Exit interface)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2267
+msgid ""
+"Allow other users to use your Internet connection for TCP traffic (via the "
+"Exit interface)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2281
+msgid "Specification of .gnunet hostnames and services offered by this peer"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:203
+#, 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
+#, fuzzy, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/setup/gnunet-setup.c:170
+#, 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:217
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/setup/gnunet-setup.c:228
+#, 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:238
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#: src/lib/os_installation.c:287
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/lib/glade.c:81
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Fehler beim Laden des Moduls `%s'\n"
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:30
+#, fuzzy
+msgid "Advertise namespace"
+msgstr "im _Namensraum"
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:52
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:62
 #, fuzzy
 msgid "Type:"
 msgstr "Ar_t:"
 
-#: contrib/publish_edit_dialog.glade:89 contrib/publish_edit_dialog.glade:171
-#: contrib/main-window.glade:397
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:79
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:161
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:89
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:171
+#: contrib/gnunet_fs_gtk_main_window.glade:356
 msgid "Value"
 msgstr "Wert"
 
-#: contrib/publish_edit_dialog.glade:109
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:99
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:109
 #, fuzzy
 msgid "Value:"
 msgstr "_Wert:"
 
-#: contrib/publish_edit_dialog.glade:158 contrib/main-window.glade:382
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:148
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:158
+#: contrib/gnunet_fs_gtk_main_window.glade:341
 msgid "Type"
 msgstr "Typ"
 
-#: contrib/publish_edit_dialog.glade:236
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:226
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:236
 #, fuzzy
 msgid "Preview:"
 msgstr "Vorschau:"
 
-#: contrib/publish_edit_dialog.glade:259
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:247
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:259
 #, fuzzy
 msgid "Select file"
 msgstr "Alle Dateien auswählen"
 
-#: contrib/publish_edit_dialog.glade:291
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:279
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:291
 msgid "_Keyword:"
 msgstr "Schl_üsselwort:"
 
-#: contrib/publish_edit_dialog.glade:341
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:333
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:341
 #, fuzzy
 msgid "Keywords"
 msgstr "Schlüsselbegriffe"
 
-#: contrib/publish_edit_dialog.glade:399
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:391
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:399
 msgid "_Normalize"
 msgstr ""
 
-#: contrib/publish_edit_dialog.glade:438
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:430
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:438
 msgid "Options"
 msgstr ""
 
-#: contrib/publish_edit_dialog.glade:463 contrib/download_as.glade:34
-#: contrib/search_dialog.glade:74 contrib/open_url_dialog.glade:67
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:456
+#: contrib/gnunet_fs_gtk_search_dialog.glade:74
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:34
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:463
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:67
 msgid "_Anonymity:"
 msgstr "_Anonymität"
 
-#: contrib/publish_edit_dialog.glade:509
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:502
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:509
 msgid "_Priority:"
 msgstr ""
 
-#: contrib/publish_edit_dialog.glade:554
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:546
 #, fuzzy
-msgid "_Index file"
-msgstr "Dateien deindizieren."
+msgid "_Root:"
+msgstr "Wu_rzel"
 
-#: contrib/publish_edit_dialog.glade:601
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:560
+msgid "root"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:586
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:601
 msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/download_as.glade:15
-#, fuzzy
-msgid "Save file as..."
-msgstr "Speichern _unter"
+#: contrib/gnunet_fs_gtk_search_tab.glade:59
+#: contrib/gnunet_fs_gtk_search_dialog.glade:157
+msgid "Description"
+msgstr "Beschreibung"
 
-#: contrib/download_as.glade:61
-msgid "_recursive"
-msgstr ""
+#: contrib/gnunet_fs_gtk_search_tab.glade:78
+msgid "Format"
+msgstr "Format"
 
-#: contrib/search_dialog.glade:27
+#: contrib/gnunet_fs_gtk_search_tab.glade:95
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:101
+#: contrib/gnunet_fs_gtk_publish_tab.glade:41
+msgid "Size"
+msgstr "Größe"
+
+#: contrib/gnunet_fs_gtk_search_tab.glade:130
+#: contrib/gnunet_fs_gtk_main_window.glade:211
+msgid "Preview"
+msgstr "Vorschau"
+
+#: contrib/gnunet_fs_gtk_search_tab.glade:154
+#, fuzzy
+msgid "query"
+msgstr "Anfrage"
+
+#: contrib/gnunet_fs_gtk_search_dialog.glade:27
 #, fuzzy
 msgid "Search GNUnet"
 msgstr "Das GNUnet nach Dateien durchsuchen."
 
-#: contrib/search_dialog.glade:45
+#: contrib/gnunet_fs_gtk_search_dialog.glade:45
 #, fuzzy
 msgid "_Query:"
 msgstr "Anfrage"
 
-#: contrib/search_dialog.glade:64 contrib/open_url_dialog.glade:56
+#: contrib/gnunet_fs_gtk_search_dialog.glade:64
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:56
 msgid ""
 "Separate multiple keywords with spaces, prefix mandatory keywords with \"+\""
 msgstr ""
 
-#: contrib/search_dialog.glade:130
+#: contrib/gnunet_fs_gtk_search_dialog.glade:130
+#: contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade:44
 msgid "Name"
 msgstr "Name"
 
-#: contrib/search_dialog.glade:145
+#: contrib/gnunet_fs_gtk_search_dialog.glade:145
 #, fuzzy
 msgid "Root"
 msgstr "Wu_rzel"
 
-#: contrib/search_dialog.glade:157 contrib/search_tab.glade:59
-msgid "Description"
-msgstr "Beschreibung"
-
-#: contrib/publish_dialog.glade:68
-msgid "Publish content on GNUnet"
-msgstr ""
-
-#: contrib/publish_dialog.glade:101 contrib/search_tab.glade:95
-#: contrib/publish_tab.glade:41
-msgid "Size"
-msgstr "Größe"
-
-#: contrib/publish_dialog.glade:114 contrib/publish_tab.glade:26
-msgid "Filename"
-msgstr "Dateiname"
-
-#: contrib/publish_dialog.glade:359
-msgid "Pseudonym"
-msgstr ""
-
-#: contrib/publish_dialog.glade:375
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:8
 #, fuzzy
-msgid "Current identifier"
-msgstr "_Nächster Identifizierer:"
-
-#: contrib/publish_dialog.glade:393
-#, fuzzy
-msgid "Update identifier"
-msgstr "_Nächster Identifizierer:"
+msgid "About gnunet-peerinfo-gtk"
+msgstr "gnunet-gtk"
 
-#: contrib/publish_dialog.glade:407
-msgid "Description (of existing content)"
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:17
+#: contrib/gnunet_setup_about_dialog.glade:17
+msgid "(C) 2011 The GNUnet Project"
 msgstr ""
 
-#: contrib/open_url_dialog.glade:19
-#, fuzzy
-msgid "Download from URI"
-msgstr "Download abgebrochen."
-
-#: contrib/open_url_dialog.glade:37
-#, fuzzy
-msgid "_URI:"
-msgstr "URI"
-
-#: contrib/search_tab.glade:78
-msgid "Format"
-msgstr "Format"
-
-#: contrib/search_tab.glade:130 contrib/main-window.glade:256
-msgid "Preview"
-msgstr "Vorschau"
-
-#: contrib/search_tab.glade:154
-#, fuzzy
-msgid "query"
-msgstr "Anfrage"
-
-#: contrib/about.glade:7
-#, fuzzy
-msgid "About gnunet-gtk"
-msgstr "gnunet-gtk"
-
-#: contrib/about.glade:17
-msgid "(C) 2010 The GNUnet Project"
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:19
+#: contrib/gnunet_setup_about_dialog.glade:19
+#: contrib/gnunet_fs_gtk_about_dialog.glade:19
+msgid "GNUnet: GNU's Framework for Secure P2P Networking"
 msgstr ""
 
-#: contrib/about.glade:19
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:20
+#: contrib/gnunet_setup_about_dialog.glade:20
+#: contrib/gnunet_fs_gtk_about_dialog.glade:20
 msgid ""
 "                    GNU GENERAL PUBLIC LICENSE\n"
 "                       Version 2, June 1991\n"
@@ -471,7 +850,9 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Replace this string with your names, one name per line.
-#: contrib/about.glade:332
+#: contrib/gnunet_peerinfo_gtk_about_dialog.glade:338
+#: contrib/gnunet_setup_about_dialog.glade:338
+#: contrib/gnunet_fs_gtk_about_dialog.glade:338
 msgid ""
 "Di Ma\n"
 "Jens Palsberg <palsberg@cs.ucla.edu>\n"
@@ -501,221 +882,818 @@ msgstr ""
 "Phan Vinh Thinh <teppi82@gmail.com>\n"
 "Daniel Nylander <po@danielnylander.se>\n"
 
-#: contrib/main-window.glade:60
-msgid "gnunet-gtk"
+#: contrib/gnunet_setup_gtk_main_window.glade:22
+#, fuzzy
+msgid "gnunet-setup"
 msgstr "gnunet-gtk"
 
-#: contrib/main-window.glade:76
+#: contrib/gnunet_setup_gtk_main_window.glade:115
+msgid "Services:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:126
+msgid "Topology"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:145
+msgid "Hostlist"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:163
 #, fuzzy
-msgid "_File sharing"
+msgid "File _Sharing"
 msgstr "Datentausc_h"
 
-#: contrib/main-window.glade:83
-msgid "_Create pseudonym"
+#: contrib/gnunet_setup_gtk_main_window.glade:182
+#: contrib/gnunet_setup_gtk_main_window.glade:4163
+msgid "_VPN"
 msgstr ""
 
-#: contrib/main-window.glade:85
-msgid ""
-"Create a pseudonym for publishing content.  Note that you can also publish "
-"content anonymously (without using a pseudonym)."
-msgstr ""
+#: contrib/gnunet_setup_gtk_main_window.glade:205
+#, fuzzy
+msgid "<b>Service Configuration</b>"
+msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/main-window.glade:97
-msgid "_Advertise Pseudonym"
+#: contrib/gnunet_setup_gtk_main_window.glade:234
+msgid "F_2F only"
 msgstr ""
 
-#: contrib/main-window.glade:108
+#: contrib/gnunet_setup_gtk_main_window.glade:265
 #, fuzzy
-msgid "_Publish"
-msgstr "Anwendung"
+msgid "Friends file:"
+msgstr "Dateien deindizieren."
 
-#: contrib/main-window.glade:110
-msgid "Publish files or directories on GNUnet"
+#: contrib/gnunet_setup_gtk_main_window.glade:300
+#, fuzzy
+msgid "Min. connected friends:"
+msgstr "# an verbundenen Knoten"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:335
+msgid "<b>Friend-to-Friend Configuration (restricts P2P connections)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:368
+msgid "Use Hostlists to bootstrap"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:385
+msgid "Learn Servers from P2P Network"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:417
+msgid "Run Hostlist Server"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:433
+msgid "Advertise Hostlist Server"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:455
+#: contrib/gnunet_setup_gtk_main_window.glade:2597
+#: contrib/gnunet_setup_gtk_main_window.glade:3215
+msgid "Port:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:507
+msgid "Known Hostlist Servers:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:534
+msgid "URL"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:581
+msgid "<b>Hostlist Configuration (for bootstrapping the network)</b>"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:599
+msgid "_General"
+msgstr "All_gemeines"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:633
+msgid "Max. download bandwidth (B/s):"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:665
+msgid "Max. upload bandwidth (B/s)"
 msgstr ""
 
-#: contrib/main-window.glade:128 contrib/main-window.glade:304
+#: contrib/gnunet_setup_gtk_main_window.glade:707
 #, fuzzy
-msgid "_Search"
-msgstr "Suche"
+msgid "<b>Bandwidth Configuration</b>"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:739
+msgid "Peer is behind _NAT"
+msgstr ""
 
-#: contrib/main-window.glade:130
+#: contrib/gnunet_setup_gtk_main_window.glade:743
+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:758
 #, fuzzy
-msgid "Search GNUnet for files"
-msgstr "Das GNUnet nach Dateien durchsuchen."
+msgid "Attempt automatic configuration"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:774
+msgid "Disable IPv_6 support"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:778
+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:822
+msgid "NAT has been hole-punched manually"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:826
+msgid ""
+"Set this option if you have configured your NAT to forward the ports for the "
+"various enabled GNUnet transports.  If the external ports are different, the "
+"respective values of the external port should be specified under "
+"\"advertised port\" for the respective transport. You also need to specify "
+"the \"External (public) IPv4 address\" of your NAT box below."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:839
+msgid "Enable NAT traversal via UPnP or PMP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:843
+msgid "This option enables the use of upnpc from miniupnpd for NAT traversal"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:856
+msgid "Enable NAT traversal using ICMP method"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:860
+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:879
+msgid ""
+"Globally visible IP address of your system (IP address of the external "
+"interface of your NAT).  You can also specify a hostname, in which case "
+"GNUnet will periodically look up the hostname in DNS to determine our "
+"external IP address (DynDNS setup)."
+msgstr ""
 
-#: contrib/main-window.glade:148 src/fs_event_handler.c:866
+#: contrib/gnunet_setup_gtk_main_window.glade:880
 #, fuzzy
-msgid "_Download"
-msgstr "Downl_oad"
+msgid "External (public) IPv4 address:"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: contrib/main-window.glade:150
-msgid "Download a file or directory with a known URI."
+#: contrib/gnunet_setup_gtk_main_window.glade:917
+msgid "Enable connecting to NATed peers using ICMP method"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:921
+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:941
+msgid ""
+"Specify the IPv4 address of your computers main network interface (typically "
+"eth0 or wlan0)."
 msgstr ""
 
-#: contrib/main-window.glade:162
+#: contrib/gnunet_setup_gtk_main_window.glade:942
+msgid "Internal (private) IPv4 address:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:999
 #, fuzzy
-msgid "_Open GNUnet directory"
-msgstr "Gtk GNUnet Konfigurator"
+msgid "<b>NAT Traversal Configuration</b>"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1020
+msgid "_Network"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1052
+msgid "Plugins to use:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1063
+msgid "_TCP"
+msgstr ""
 
-#: contrib/main-window.glade:164
+#: contrib/gnunet_setup_gtk_main_window.glade:1083
+msgid "_UDP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1102
+msgid "_HTTP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1122
+msgid "HTTP_S"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1142
+msgid "D_V"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1161
+msgid "_WLAN"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1202
+#: contrib/gnunet_setup_gtk_main_window.glade:1413
+#: contrib/gnunet_setup_gtk_main_window.glade:1623
+#: contrib/gnunet_setup_gtk_main_window.glade:1835
+msgid "Bind to port:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1236
+msgid "Use Port \"0\" to only allow outgoing TCP connections"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1261
+#: contrib/gnunet_setup_gtk_main_window.glade:1463
+#: contrib/gnunet_setup_gtk_main_window.glade:1673
+#: contrib/gnunet_setup_gtk_main_window.glade:1885
+msgid "Advertised port:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1295
+#: contrib/gnunet_setup_gtk_main_window.glade:1495
+#: contrib/gnunet_setup_gtk_main_window.glade:1707
+#: contrib/gnunet_setup_gtk_main_window.glade:1919
 msgid ""
-"Use this option to browse a GNUnet directory file that has been previously "
-"downloaded."
+"External port visible on our public IP address after mappings by NAT/"
+"firewalls"
 msgstr ""
 
-#: contrib/main-window.glade:184
+#: contrib/gnunet_setup_gtk_main_window.glade:1328
+#: contrib/gnunet_setup_gtk_main_window.glade:1529
+#: contrib/gnunet_setup_gtk_main_window.glade:1741
+#: contrib/gnunet_setup_gtk_main_window.glade:1953
+#, fuzzy
+msgid "Test configuration"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1345
+#: contrib/gnunet_setup_gtk_main_window.glade:1546
+#: contrib/gnunet_setup_gtk_main_window.glade:1758
+#: contrib/gnunet_setup_gtk_main_window.glade:1970
+#: contrib/gnunet_setup_gtk_main_window.glade:2681
+#: contrib/gnunet_setup_gtk_main_window.glade:2792
+#: contrib/gnunet_setup_gtk_main_window.glade:3299
+#: contrib/gnunet_setup_gtk_main_window.glade:3411
+msgid "Configuration works!"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1358
+#: contrib/gnunet_setup_gtk_main_window.glade:1559
+#: contrib/gnunet_setup_gtk_main_window.glade:1771
+#: contrib/gnunet_setup_gtk_main_window.glade:1983
+#, fuzzy
+msgid "Test failed!"
+msgstr "`%s' schlug fehl: %s\n"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1393
+msgid "TCP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1412
+#: contrib/gnunet_setup_gtk_main_window.glade:1622
+#: contrib/gnunet_setup_gtk_main_window.glade:1834
 msgid ""
-"Exit gnunet-gtk.  Active file-sharing operations will resume upon restart."
+"Port number that GNUnet's UDP transport should bind to on the local system"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1600
+msgid "UDP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:1812
+msgid "HTTP"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2024
+msgid "HTTPS"
 msgstr ""
 
-#: contrib/main-window.glade:200
+#: contrib/gnunet_setup_gtk_main_window.glade:2047
+msgid "DV"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2066
+msgid "Name of _Monitor Interface"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2115
+msgid "WLAN"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2137
 #, fuzzy
-msgid "_Edit"
-msgstr "_Beenden"
+msgid "<b>Transport Configuration</b>"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2150
+msgid "_Transports"
+msgstr ""
 
-#: contrib/main-window.glade:209
+#: contrib/gnunet_setup_gtk_main_window.glade:2179
+msgid "Enable unsolicited content transmission from this peer"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2197
+msgid "Enable caching content at this peer"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2220
 #, fuzzy
-msgid "Edit the system configuration."
+msgid "<b>File Sharing Options</b>"
+msgstr "<b>Laufende Anwendungen</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2254
+#, fuzzy
+msgid "Database Backend to use:"
+msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2270
+#: contrib/gnunet_setup_gtk_main_window.glade:2396
+#: contrib/gnunet_setup_gtk_main_window.glade:2884
+#: contrib/gnunet_setup_gtk_main_window.glade:3010
+msgid "sqLite"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2288
+#: contrib/gnunet_setup_gtk_main_window.glade:2647
+#: contrib/gnunet_setup_gtk_main_window.glade:2902
+#: contrib/gnunet_setup_gtk_main_window.glade:3265
+msgid "MySQL"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2307
+#: contrib/gnunet_setup_gtk_main_window.glade:2758
+#: contrib/gnunet_setup_gtk_main_window.glade:2921
+#: contrib/gnunet_setup_gtk_main_window.glade:3377
+msgid "Postgres"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2346
+#: contrib/gnunet_setup_gtk_main_window.glade:2960
+#, fuzzy
+msgid "Quota (bytes):"
+msgstr "Downstream (Bytes/s):"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2389
+#: contrib/gnunet_setup_gtk_main_window.glade:3003
+msgid "No setup required."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2414
+#: contrib/gnunet_setup_gtk_main_window.glade:3028
+msgid "MySQL database name:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2428
+#: contrib/gnunet_setup_gtk_main_window.glade:3042
+#, fuzzy
+msgid "gnunet"
+msgstr "gnunet-gtk"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2458
+#: contrib/gnunet_setup_gtk_main_window.glade:3072
+#, fuzzy
+msgid "Configuration file:"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2493
+#: contrib/gnunet_setup_gtk_main_window.glade:3108
+#, fuzzy
+msgid "Username:"
+msgstr "_Dateiname:"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2524
+#: contrib/gnunet_setup_gtk_main_window.glade:3140
+msgid "Password:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2565
+#: contrib/gnunet_setup_gtk_main_window.glade:3182
+msgid "MySQL Server Hostname:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2579
+#: contrib/gnunet_setup_gtk_main_window.glade:3196
+msgid "localhost"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:2667
+#: contrib/gnunet_setup_gtk_main_window.glade:2778
+#, fuzzy
+msgid "Test datastore configuration"
 msgstr "<b>GNUnet Konfiguration</b>"
 
-#: contrib/main-window.glade:224
-msgid "_View"
+#: contrib/gnunet_setup_gtk_main_window.glade:2693
+#: contrib/gnunet_setup_gtk_main_window.glade:2804
+#: contrib/gnunet_setup_gtk_main_window.glade:3311
+#: contrib/gnunet_setup_gtk_main_window.glade:3423
+msgid "Configuration error!"
 msgstr ""
 
-#: contrib/main-window.glade:232
-msgid "Show meta data in main window"
+#: contrib/gnunet_setup_gtk_main_window.glade:2716
+#: contrib/gnunet_setup_gtk_main_window.glade:3334
+msgid "Configuration:"
 msgstr ""
 
-#: contrib/main-window.glade:234
-msgid "Metadata"
-msgstr "Metainformationen"
+#: contrib/gnunet_setup_gtk_main_window.glade:2730
+#: contrib/gnunet_setup_gtk_main_window.glade:3348
+msgid "connect_timeout=10; dbname=gnunet"
+msgstr ""
 
-#: contrib/main-window.glade:243
-msgid "Activates the panel showing information about known and connected peers"
+#: contrib/gnunet_setup_gtk_main_window.glade:2834
+msgid "<b>Configure Datastore (persistent storage)</b>"
 msgstr ""
 
-#: contrib/main-window.glade:245
-msgid "Neighbours"
+#: contrib/gnunet_setup_gtk_main_window.glade:2868
+msgid "Datacache:"
 msgstr ""
 
-#: contrib/main-window.glade:254
-msgid "Show preview (when available)"
+#: contrib/gnunet_setup_gtk_main_window.glade:3285
+#: contrib/gnunet_setup_gtk_main_window.glade:3397
+#, fuzzy
+msgid "Test datacache configuration"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3453
+msgid "<b>Configure Datacache (temporary storage)</b>"
 msgstr ""
 
-#: contrib/main-window.glade:270
+#: contrib/gnunet_setup_gtk_main_window.glade:3473
 #, fuzzy
-msgid "_Help"
-msgstr "_Hilfe"
+msgid "_File Sharing"
+msgstr "Datentausc_h"
 
-#: contrib/main-window.glade:279
-msgid "Display information about this version of gnunet-gtk"
+#: contrib/gnunet_setup_gtk_main_window.glade:3508
+msgid "Master _interface name:"
 msgstr ""
 
-#: contrib/main-window.glade:353
-msgid "Thumbnail associated with the currently selected content"
+#: contrib/gnunet_setup_gtk_main_window.glade:3549
+msgid "IPv4 address for Master interface:"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3578
+#: contrib/gnunet_setup_gtk_main_window.glade:3646
+#: contrib/gnunet_setup_gtk_main_window.glade:3907
+#: contrib/gnunet_setup_gtk_main_window.glade:3975
+msgid "/"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3617
+msgid "IPv6 address for Master interface: "
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3686
+msgid "Virtual DNS Server:"
 msgstr ""
 
-#: contrib/main-window.glade:441
+#: contrib/gnunet_setup_gtk_main_window.glade:3726
 #, fuzzy
-msgid "Peer"
-msgstr "nie"
+msgid "<b>VPN Master Interface Configuration</b>"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3744
+msgid "Enable VPN Exit"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3761
+msgid "Enable DNS Exit"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3806
+msgid "Exit interface name: "
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3833
+msgid "Enable UDP Exit"
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:3849
+msgid "Enable TCP exit"
+msgstr ""
 
-#: contrib/main-window.glade:460
+#: contrib/gnunet_setup_gtk_main_window.glade:3878
 #, fuzzy
-msgid "Bandwidth"
-msgstr "Bandbreitenbeschränkung"
+msgid "IPv4 address for Exit interface: "
+msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: contrib/main-window.glade:474
-msgid "Country"
+#: contrib/gnunet_setup_gtk_main_window.glade:3946
+#, 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:4015
+#, fuzzy
+msgid "<b>GNUnet VPN Exit Interface</b>"
+msgstr "<b>gnunetd Kontrolle</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4057
+#, fuzzy
+msgid "DNS name"
+msgstr "Name anzeigen"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4075
+msgid "Prot."
+msgstr ""
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4089
+msgid "Source Port"
 msgstr ""
 
-#: contrib/publish-file-dialog.glade:8
+#: contrib/gnunet_setup_gtk_main_window.glade:4103
+#, fuzzy
+msgid "Destination"
+msgstr "Beschreibung"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4142
+#, fuzzy
+msgid "<b>DNS Services Configuration</b>"
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_setup_gtk_main_window.glade:4180
+#, fuzzy
+msgid "Welcome to gnunet-setup."
+msgstr "Vorlage für gnunet-clients."
+
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:8
 #, fuzzy
 msgid "Publish file..."
 msgstr "Publizierter Dateiname"
 
-#: contrib/publish-file-dialog.glade:25
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:25
 #, fuzzy
 msgid "Index file"
 msgstr "Dateien deindizieren."
 
-#: contrib/publish-file-dialog.glade:47
-#: contrib/publish-directory-dialog.glade:66
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:47
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:66
 msgid "Priority:"
 msgstr ""
 
-#: contrib/publish-file-dialog.glade:82
-#: contrib/publish-directory-dialog.glade:101
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:82
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:101
 msgid "Expiration year:"
 msgstr ""
 
-#: contrib/publish-file-dialog.glade:108
-#: contrib/publish-directory-dialog.glade:126
+#: contrib/gnunet_fs_gtk_publish_file_dialog.glade:108
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:126
 #, fuzzy
 msgid "Anonymity:"
 msgstr "_Anonymität"
 
-#: contrib/publish_tab.glade:65
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:15
 #, fuzzy
-msgid "filename"
+msgid "Save file as..."
+msgstr "Speichern _unter"
+
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:61
+msgid "_recursive"
+msgstr ""
+
+#: contrib/gnunet_setup_about_dialog.glade:8
+#, fuzzy
+msgid "About gnunet-setup"
+msgstr "gnunet-gtk"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:68
+msgid "Publish content on GNUnet"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:114
+#: contrib/gnunet_fs_gtk_publish_tab.glade:26
+msgid "Filename"
 msgstr "Dateiname"
 
-#: contrib/status_bar_menu.glade:11
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:359
+msgid "Pseudonym"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:375
+#, fuzzy
+msgid "Current identifier"
+msgstr "_Nächster Identifizierer:"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:393
+#, fuzzy
+msgid "Update identifier"
+msgstr "_Nächster Identifizierer:"
+
+#: contrib/gnunet_fs_gtk_publish_dialog.glade:407
+msgid "Description (of existing content)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_tab.glade:65
+#, fuzzy
+msgid "Publishing"
+msgstr "Anwendung"
+
+#: contrib/gnunet_gtk_status_bar_menu.glade:11
 #, fuzzy
 msgid "Quit"
 msgstr "_Beenden"
 
-#: contrib/publish-directory-dialog.glade:44
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:554
 #, fuzzy
-msgid "Index files"
+msgid "_Index file"
 msgstr "Dateien deindizieren."
 
-#: src/gnunet-gtk.c:388
-#, fuzzy, c-format
-msgid "Failed to load `%s': %s\n"
-msgstr "Fehler beim Laden des Moduls `%s'\n"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:25
+msgid "gnunet-gtk"
+msgstr "gnunet-gtk"
 
-#: src/gnunet-gtk.c:643
-msgid "start in tray mode"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:44
+#: contrib/gnunet_fs_gtk_main_window.glade:225
+#, fuzzy
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:55
+msgid "Display information about this version of gnunet-gtk"
 msgstr ""
 
-#: src/fs_event_handler.c:313
-msgid "Metadata wrongly claims that this is a GNUnet directory!\n"
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:95
+#, fuzzy
+msgid "Peer"
+msgstr "nie"
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:112
+msgid "In"
 msgstr ""
 
-#: src/fs_event_handler.c:878
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:128
+msgid "Out"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:143
+msgid "Country"
+msgstr ""
+
+#: contrib/gnunet_peerinfo_gtk_main_window.glade:159
+msgid "Addresses"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:26
 #, fuzzy
-msgid "_Abort download"
-msgstr "Downl_oad"
+msgid "gnunet-fs-gtk"
+msgstr "gnunet-gtk"
 
-#: src/fs_event_handler.c:890
-msgid "_Copy URI to Clipboard"
+#: contrib/gnunet_fs_gtk_main_window.glade:42
+#, fuzzy
+msgid "_File sharing"
+msgstr "Datentausc_h"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:49
+msgid "_Create pseudonym"
 msgstr ""
 
-#: src/fs_event_handler.c:1377 src/fs_event_handler.c:1577
+#: contrib/gnunet_fs_gtk_main_window.glade:51
+msgid ""
+"Create a pseudonym for publishing content.  Note that you can also publish "
+"content anonymously (without using a pseudonym)."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:63
+msgid "_Advertise Pseudonym"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:74
 #, fuzzy
-msgid "no description supplied"
-msgstr "Keine Kommandos angegeben.\n"
+msgid "_Publish"
+msgstr "Anwendung"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:76
+msgid "Publish files or directories on GNUnet"
+msgstr ""
 
-#: src/fs_event_handler.c:1379
+#: contrib/gnunet_fs_gtk_main_window.glade:94
+#: contrib/gnunet_fs_gtk_main_window.glade:260
 #, fuzzy
-msgid "no URI"
+msgid "_Search"
+msgstr "Suche"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:96
+#, fuzzy
+msgid "Search GNUnet for files"
+msgstr "Das GNUnet nach Dateien durchsuchen."
+
+#: contrib/gnunet_fs_gtk_main_window.glade:116
+msgid "Download a file or directory with a known URI."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:128
+#, fuzzy
+msgid "_Open GNUnet directory"
+msgstr "Gtk GNUnet Konfigurator"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:130
+msgid ""
+"Use this option to browse a GNUnet directory file that has been previously "
+"downloaded."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:150
+msgid ""
+"Exit gnunet-fs-gtk.  Active file-sharing operations will resume upon restart."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:166
+#, fuzzy
+msgid "_Edit"
+msgstr "_Beenden"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:175
+#, fuzzy
+msgid "Edit the system configuration."
+msgstr "<b>GNUnet Konfiguration</b>"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:190
+msgid "_View"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:198
+msgid "Show meta data in main window"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:200
+msgid "Metadata"
+msgstr "Metainformationen"
+
+#: contrib/gnunet_fs_gtk_main_window.glade:209
+msgid "Show preview (when available)"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:234
+msgid "Display information about this version of gnunet-fs-gtk"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_main_window.glade:312
+msgid "Thumbnail associated with the currently selected content"
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:19
+#, fuzzy
+msgid "Download from URI"
+msgstr "Download abgebrochen."
+
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:37
+#, fuzzy
+msgid "_URI:"
 msgstr "URI"
 
-#: src/edit_publish_dialog.c:646
-#, fuzzy, c-format
-msgid "Could not load preview `%s' into memory\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+#: contrib/gnunet_fs_gtk_create_namespace_dialog.glade:9
+#, fuzzy
+msgid "Create namespace"
+msgstr "Namensraum erzeugen"
 
-#: src/common.c:173
-#, fuzzy, c-format
-msgid "Selected file `%s' is not a GNUnet directory!\n"
-msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+#: contrib/gnunet_fs_gtk_create_namespace_dialog.glade:27
+msgid "_Name:"
+msgstr "_Name:"
 
-#: src/main_window_file_search.c:114
-#, fuzzy, c-format
-msgid "Invalid keyword string `%s': %s"
-msgstr "Ungültige Antwort auf `%s' von `%s'\n"
+#: contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade:19
+msgid "Select pseudonym..."
+msgstr ""
+
+#: contrib/gnunet_fs_gtk_publish_directory_dialog.glade:44
+#, fuzzy
+msgid "Index files"
+msgstr "Dateien deindizieren."
+
+#: contrib/gnunet_fs_gtk_about_dialog.glade:8
+#, fuzzy
+msgid "About gnunet-fs-gtk"
+msgstr "gnunet-gtk"
+
+#: contrib/gnunet_fs_gtk_about_dialog.glade:17
+msgid "(C) 2010,2011 The GNUnet Project"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Bandwidth"
+#~ msgstr "Bandbreitenbeschränkung"
+
+#, fuzzy
+#~ msgid "filename"
+#~ msgstr "Dateiname"
 
 #, fuzzy
 #~ msgid "_Anonymity"
@@ -967,9 +1945,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "Identity"
 #~ msgstr "_Identifizierer:"
 
-#~ msgid "Failed to find handler for `%s'\n"
-#~ msgstr "Handler für `%s' konnte nicht gefunden werden\n"
-
 #~ msgid "Could not initialize libnotify\n"
 #~ msgstr "libnotify konnte nicht initialisiert werden\n"
 
@@ -1015,23 +1990,9 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgstr "Stoppt den gnunetd Daemonen"
 
 #, fuzzy
-#~ msgid "<b>GNUnet Daemon Control</b>"
-#~ msgstr "<b>gnunetd Kontrolle</b>"
-
-#~ msgid "<b>Running Applications</b>"
-#~ msgstr "<b>Laufende Anwendungen</b>"
-
-#, fuzzy
-#~ msgid "<b>GNUnet Daemon Configuration</b>"
-#~ msgstr "<b>GNUnet Konfiguration</b>"
-
-#, fuzzy
 #~ msgid "Select gnunetd configuration File"
 #~ msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#~ msgid "_General"
-#~ msgstr "All_gemeines"
-
 #~ msgid "Cancel the selected search"
 #~ msgstr "Die ausgewählte Suche abbrechen."
 
@@ -1091,9 +2052,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Anonymität. Höhere Werte bieten mehr Privatsphäre, bedeuten aber auch "
 #~ "weniger Performance."
 
-#~ msgid "in _namespace"
-#~ msgstr "im _Namensraum"
-
 #~ msgid ""
 #~ "This is the rating that you have given this namespace so far.  Ratings "
 #~ "are private and not shared with other users in any way.  They are "
@@ -1182,9 +2140,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Die angegebene Datei mit dem angegebenen Optionen hochladen (Sie werden "
 #~ "dann aufgefordert, Metadaten und Schlüsselwörter einzugeben)."
 
-#~ msgid "_Filename:"
-#~ msgstr "_Dateiname:"
-
 #~ msgid "Browse local computer for files (or directories) to publish."
 #~ msgstr ""
 #~ "Lokalen Computer nach Dateien (oder Verzeichnissen) zum Hochladen "
@@ -1443,9 +2398,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "Select this file (or directory) for the publication."
 #~ msgstr "Diese Datei (oder Verzeichnis) zum Upload auswählen"
 
-#~ msgid "Create Namespace"
-#~ msgstr "Namensraum erzeugen"
-
 #~ msgid "Cancel namespace creation."
 #~ msgstr "Namensraumerzeugung abbrechen."
 
@@ -1459,9 +2411,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "Please provide information about the namespace"
 #~ msgstr "Bitte Informationen über den Namensraum angeben"
 
-#~ msgid "_Name:"
-#~ msgstr "_Name:"
-
 #~ msgid ""
 #~ "Each namespace is supposed to have a name.  While GNUnet cannot guarantee "
 #~ "that these names are unique, users should try to select names that are "
@@ -1794,9 +2743,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "unnamed"
 #~ msgstr "unbenannt"
 
-#~ msgid "# of connected peers"
-#~ msgstr "# an verbundenen Knoten"
-
 #, fuzzy
 #~ msgid "# bytes decrypted"
 #~ msgstr "# Bytes des Typs %d empfangen"
@@ -1974,10 +2920,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgstr "Einträge aus der Verzeichnis Datenbank auflisten"
 
 #, fuzzy
-#~ msgid "`%s' is not a file!\n"
-#~ msgstr "`%s' ist keine normale Datei.\n"
-
-#, fuzzy
 #~ msgid "Insertion of file `%s' failed!\n"
 #~ msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
 
@@ -1992,10 +2934,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgstr "_Datei"
 
 #, fuzzy
-#~ msgid "/File/_Unindex file"
-#~ msgstr "Dateien deindizieren."
-
-#, fuzzy
 #~ msgid "/Help/_About"
 #~ msgstr "_über"
 
@@ -2675,9 +3613,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten "
 #~ "von bestehenden Pseudonymen."
 
-#~ msgid "Invalid argument: `%s'\n"
-#~ msgstr "Ungültiger Parameter: `%s'\n"
-
 #~ msgid "Invalid arguments. Exiting.\n"
 #~ msgstr "Ungültige Parameter. Abbruch.\n"
 
@@ -2895,9 +3830,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "helptext for -t"
 #~ msgstr "Hilfetext für -t"
 
-#~ msgid "Template for gnunet-clients."
-#~ msgstr "Vorlage für gnunet-clients."
-
 #, fuzzy
 #~ msgid "Error receiving reply for statistics from peer.\n"
 #~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
@@ -2946,9 +3878,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "Protocol violation on socket. Expected command.\n"
 #~ msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#~ msgid "Command `%s' not found!\n"
-#~ msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
 #~ msgid "Start GNUnet testbed controller."
 #~ msgstr "GNUnet testbed Controller starten."
 
@@ -3089,10 +4018,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "# p2p trace replies sent"
 #~ msgstr "# p2p Trace-Antworten gesendet"
 
-#, fuzzy
-#~ msgid "`%s' failed!\n"
-#~ msgstr "`%s' schlug fehl: %s\n"
-
 #~ msgid "`%s' failed: table not found!\n"
 #~ msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
@@ -3256,9 +4181,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "RPC not unregistered: %s:%p\n"
 #~ msgstr "RPC nicht unregistriert: %s:%p\n"
 
-#~ msgid "Failed to initialize `%s' service.\n"
-#~ msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
-
 #~ msgid "RPC async reply invalid.\n"
 #~ msgstr "RPC async Antwort ungültig.\n"
 
@@ -3360,13 +4282,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 #~ "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#~ msgid ""
-#~ "You should specify at least one transport service under option `%s' in "
-#~ "section `%s'.\n"
-#~ msgstr ""
-#~ "Sie sollten mindestens einen Transport Dienst unter der Option `%s' in "
-#~ "der Sektion `%s' angegeben.\n"
-
 #~ msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 #~ msgstr ""
 #~ "Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
@@ -3747,9 +4662,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Verbindung von Adresse %s wird abgewiesen, Sender steht auf schwarzer "
 #~ "Liste.\n"
 
-#~ msgid "Could not determine my public IPv6 address.\n"
-#~ msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-
 #~ msgid "`%s': unknown service: %s\n"
 #~ msgstr "`%s': unbekannter Dienst: %s\n"
 
@@ -3827,9 +4739,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Konfigurationsdatei `%s' wurde nicht gefunden. Es wird versucht, an "
 #~ "dieser Stelle eine Standardkonfigurationsdatei anzulegen.\n"
 
-#~ msgid "Cannot open configuration file `%s'\n"
-#~ msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
 #~ msgid ""
 #~ "`%s' called with cron job not in queue, adding.  This may not be what you "
 #~ "want.\n"
@@ -3898,9 +4807,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 #~ "werden.\n"
 
-#~ msgid "Could not find an IP address for interface `%s'.\n"
-#~ msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "There is more than one IP address specified for interface `%s'.\n"
@@ -4109,9 +5015,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "Show _name"
 #~ msgstr "_Name anzeigen"
 
-#~ msgid "Show name"
-#~ msgstr "Name anzeigen"
-
 #~ msgid "Show _range"
 #~ msgstr "_Bereich anzeigen"
 
@@ -4299,9 +5202,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ msgid "Upstream (Bytes/s):"
 #~ msgstr "Upstream (Bytes/s):"
 
-#~ msgid "Downstream (Bytes/s):"
-#~ msgstr "Downstream (Bytes/s):"
-
 #~ msgid "Use denoted bandwidth for GNUnet"
 #~ msgstr "Angegebene Bandbreite für GNUnet verwenden"
 
@@ -4411,9 +5311,6 @@ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 #~ "Ungültige Daten in der MySQL Datenbank. Bitte überprüfen Sie die "
 #~ "Integrität!\n"
 
-#~ msgid "Database failed to delete %s.\n"
-#~ msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
-
 #~ msgid "`%s' registering handler %d\n"
 #~ msgstr "`%s' registriert Handler %d\n"
 
diff --git a/po/fr.po b/po/fr.po
index ee316ede..8c5411aa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-gtk-0.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnunet@gnu.org\n"
-"POT-Creation-Date: 2011-06-10 11:26+0200\n"
+"POT-Creation-Date: 2011-09-19 14:26+0200\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,172 +17,554 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/publish_edit_dialog.glade:62
+#: src/peerinfo/gnunet-peerinfo-gtk.c:369
+#, c-format
+msgid "Failed to initialize communication with peerinfo service!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-peerinfo-gtk.c:397 src/fs/gnunet-fs-gtk.c:243
+msgid "start in tray mode"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-common.c:158
+#, c-format
+msgid "Selected file `%s' is not a GNUnet directory!\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:300
+msgid "Metadata wrongly claims that this is a GNUnet directory!\n"
+msgstr ""
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:781
+#: contrib/gnunet_fs_gtk_main_window.glade:114
+#, fuzzy
+msgid "_Download"
+msgstr "Téléchar_ger"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:791
+#, fuzzy
+msgid "_Abort download"
+msgstr "Téléchar_ger"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:801
+msgid "_Copy URI to Clipboard"
+msgstr "_Copier l'URI dans le presse-papiers"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:1267
+#: src/fs/gnunet-fs-gtk-event_handler.c:1444
+#, fuzzy
+msgid "no description supplied"
+msgstr "Collection arrêtée.\n"
+
+#: src/fs/gnunet-fs-gtk-event_handler.c:1269
+#, fuzzy
+msgid "no URI"
+msgstr "URI"
+
+#: src/fs/gnunet-fs-gtk-edit_publish_dialog.c:639
+#, 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-main_window_file_search.c:108
+#, c-format
+msgid "Invalid keyword string `%s': %s"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:572 src/setup/gnunet-setup-options.c:580
+#, c-format
+msgid "Option `%s' is not formatted correctly!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:591 src/setup/gnunet-setup-options.c:599
+#, c-format
+msgid "`%s' is not a valid port number!\n"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1461
+msgid "Should GNUnet exclusively connect to friends?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1472
+msgid "Friends file containing the list of friendly peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1483
+msgid "Minimum number of friendly connections"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1494
+msgid "Topology should always be loaded"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1506
+msgid "Should hostlist support be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1518
+msgid "Should file-sharing be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1529
+msgid "Should the VPN be started automatically on startup?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1540
+msgid "Should GNUnet learn about other peers using hostlists"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1551
+msgid "Should GNUnet learn hostlists from other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1562
+msgid "Should this peer offer a hostlist to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1573
+msgid "Should this peer advertise its hostlist to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1584
+msgid "Port this peers hostlist should be offered on"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1603
+msgid "Known hostlist URLs"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1613
+msgid "How many bytes per second are we allowed to transmit?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1624
+msgid "How many bytes per second are we allowed to receive?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1637
+msgid "Enable communication via TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1648
+msgid "Enable communication via UDP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1659
+msgid "Enable communication via HTTP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1670
+msgid "Enable communication via HTTPS"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1681
+msgid "Enable communication via DV"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1692
+msgid "Enable communication via WLAN"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1703
+msgid "Port we bind to for TCP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1714
+msgid "Port visible to other peers"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1725
+msgid "Check if this peer is behind a NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1736
+msgid "Check if the NAT has been hole-punched manually"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1747
+msgid "Enable NAT traversal with UPnP/PMP"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1759
+msgid "Enable NAT traversal with ICMP as server"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1771
+msgid "External (public) IP address of the NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1782
+msgid "Enable NAT traversal with ICMP as client"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1793
+msgid "Internal (private) IP address of the NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1804
+msgid "Disable IPv6 support"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1816
+msgid "Port for inbound UDP packets, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1827
+msgid "Port for inbound HTTP connections, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1838
+msgid "Port for inbound HTTPS connections, use 0 if behind NAT"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1851
+msgid "Use sqLite to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1862
+msgid "Use MySQL to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1873
+msgid "Use Postgres to store file-sharing content"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1884 src/setup/gnunet-setup-options.c:2017
+msgid "Name for the MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1895 src/setup/gnunet-setup-options.c:2028
+#, fuzzy
+msgid "Configuration file for MySQL access"
+msgstr "Fichier de _configuration à utiliser pour gnunetd :"
+
+#: src/setup/gnunet-setup-options.c:1906 src/setup/gnunet-setup-options.c:2039
+msgid "Username for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1917 src/setup/gnunet-setup-options.c:2050
+msgid "Password for MySQL access"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1928 src/setup/gnunet-setup-options.c:2061
+msgid "Name of host running MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1939 src/setup/gnunet-setup-options.c:2083
+msgid "Port of MySQL database"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1950 src/setup/gnunet-setup-options.c:2094
+#, fuzzy
+msgid "Configuration for Postgres (passed to PQconnectdb)"
+msgstr "Fichier de _configuration à utiliser pour gnunetd :"
+
+#: src/setup/gnunet-setup-options.c:1962
+msgid "Should we try to push our content to other peers?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1973
+msgid "Are we allowed to cache content received from other peers?"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1984
+msgid "Use sqLite to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:1995
+msgid "Use MySQL to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2006
+msgid "Use Postgres to cache DHT data"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2072
+msgid "Name of monitoring interface to use (monX)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2105
+msgid "Name of the virtual interface the GNUnet VPN should create"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2116
+msgid "IPv4 address to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2127
+msgid "IPv4 network mask to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2138
+msgid "IPv6 address to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2149
+msgid "IPv6 network prefix length to use for the VPN interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2161
+msgid ""
+"IP address of the virtual DNS server that resolves through GNUnet (use in "
+"resolve.conf if you want to resolve through some GNUnet DNS Exit)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2173
+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:2185
+msgid ""
+"Allow other peers to perform DNS resolutions using your Internet connection"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2197
+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:2208
+msgid "IPv4 address to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2219
+msgid "IPv4 network mask to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2230
+msgid "IPv6 address to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2242
+msgid "IPv6 network prefix length to use for the VPN Exit interface"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2255
+msgid ""
+"Allow other users to use your Internet connection for UDP traffic (via the "
+"Exit interface)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2267
+msgid ""
+"Allow other users to use your Internet connection for TCP traffic (via the "
+"Exit interface)"
+msgstr ""
+
+#: src/setup/gnunet-setup-options.c:2281
+msgid "Specification of .gnunet hostnames and services offered by this peer"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:115 src/setup/gnunet-setup.c:203
+#, c-format
+msgid "Widget `%s' not found\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:124 src/setup/gnunet-setup.c:139
+#, c-format
+msgid "Invalid regular expression `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:170
+#, 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:217
+#, fuzzy, c-format
+msgid "Failed to initialize widget `%s'\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: src/setup/gnunet-setup.c:228
+#, c-format
+msgid "No default value known for option `%s' in section `%s'\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:238
+#, c-format
+msgid "Failed to initialize widget `%s' with value `%s'\n"
+msgstr ""
+
+#: src/lib/os_installation.c:287
+#, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+
+#: src/lib/glade.c:81
+#, fuzzy, c-format
+msgid "Failed to load `%s': %s\n"
+msgstr "Impossible de trouver un gestionnaire pour « %s »\n"
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:30
+#, fuzzy
+msgid "Advertise namespace"
+msgstr "dans l'espace de _noms"
+
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:52
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:62
 #, fuzzy
 msgid "Type:"
 msgstr "_Type :"
 
-#: contrib/publish_edit_dialog.glade:89 contrib/publish_edit_dialog.glade:171
-#: contrib/main-window.glade:397
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:79
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:161
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:89
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:171
+#: contrib/gnunet_fs_gtk_main_window.glade:356
 msgid "Value"
 msgstr "Valeur :"
 
-#: contrib/publish_edit_dialog.glade:109
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:99
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:109
 #, fuzzy
 msgid "Value:"
 msgstr "_Valeur :"
 
-#: contrib/publish_edit_dialog.glade:158 contrib/main-window.glade:382
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:148
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:158
+#: contrib/gnunet_fs_gtk_main_window.glade:341
 msgid "Type"
 msgstr "Type"
 
-#: contrib/publish_edit_dialog.glade:236
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:226
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:236
 #, fuzzy
 msgid "Preview:"
 msgstr "A_perçu :"
 
-#: contrib/publish_edit_dialog.glade:259
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:247
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:259
 #, fuzzy
 msgid "Select file"
 msgstr "Sélectionner tous les fichiers"
 
-#: contrib/publish_edit_dialog.glade:291
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:279
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:291
 msgid "_Keyword:"
 msgstr "_Mot-clé :"
 
-#: contrib/publish_edit_dialog.glade:341
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:333
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:341
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: contrib/publish_edit_dialog.glade:399
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:391
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:399
 msgid "_Normalize"
 msgstr ""
 
-#: contrib/publish_edit_dialog.glade:438
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:430
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:438
 #, fuzzy
 msgid "Options"
 msgstr "Opé_rations"
 
-#: contrib/publish_edit_dialog.glade:463 contrib/download_as.glade:34
-#: contrib/search_dialog.glade:74 contrib/open_url_dialog.glade:67
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:456
+#: contrib/gnunet_fs_gtk_search_dialog.glade:74
+#: contrib/gnunet_fs_gtk_download_as_dialog.glade:34
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:463
+#: contrib/gnunet_fs_gtk_open_url_dialog.glade:67
 msgid "_Anonymity:"
 msgstr "_Anonymat :"
 
-#: contrib/publish_edit_dialog.glade:509
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:502
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:509
 #, fuzzy
 msgid "_Priority:"
 msgstr "_Priorité :"
 
-#: contrib/publish_edit_dialog.glade:554
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:546
 #, fuzzy
-msgid "_Index file"
-msgstr "_Identifiant :"
+msgid "_Root:"
+msgstr "_Racine :"
 
-#: contrib/publish_edit_dialog.glade:601
-msgid "_Expriation year:"
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:560
+msgid "root"
 msgstr ""
 
-#: contrib/download_as.glade:15
-msgid "Save file as..."
+#: contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade:586
+#: contrib/gnunet_fs_gtk_publish_edit_dialog.glade:601
+msgid "_Expriation year:"
 msgstr ""
 
-#: contrib/download_as.glade:61
+#: contrib/gnunet_fs_gtk_search_tab.glade:59
+#: contrib/gnunet_fs_gtk_search_dialog.glade:157