diff --git a/i18n/en.po b/i18n/en.po
index 75bb4db38920703cf72d1e0af17d12c4c0df0e65..528c4ce07d71be979042b98098ebe6043ec7368c 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 20:28+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
+"PO-Revision-Date: 2015-04-25 19:00+0100\n"
+"Last-Translator: bdobe\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -12,22 +12,37 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk node. "
-"Please fill out the following form and transmit it."
+"Welcome the the setup wizard for your new Freifunk node. "
+"Please fill out and then transmit the following form. "
+"You're free to choose your own node name in the field below, so "
+"come up with something nice. This will be the name of the node in "
+"the network and has nothing to do with the broadcast network name (SSID). "
+"The latter is always nord.freifunk.net."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"This is your Freifunk node's public key. The node won't be able to "
-"connect to the mesh VPN until the key has been registered on the Freifunk servers. "
-"To register the key send it together with your node's name (<em><%=hostname%></em>) to <a href="
-"\"mailto:keys@freifunk-keys@in-kiel.de?subject=Anmeldung:%20<%=hostname%>&amp;"
-"body=%23%20<%=hostname%>%0A%23%20<%=sysconfig.primary_mac%>%0Akey%20%22<"
-"%=pubkey%>%22%3B\">keys@freifunk-keys@in-kiel.de</a>."
+"<p>This is the public key for your Freifunk node. You can only "
+"connect the node to the Freifunk Nord mesh VPN after the key has been registered on "
+"the Freifunk Nord servers. "
+"Please register your key, the name of your node (<em><%=hostname%></em>), and a bit of additional info at "
+"<a href=\"https://formular.ffnord.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.ffnord.net/</a>.</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
-"<p>The node is currently rebooting and will try to connect to other "
-"nearby Freifunk nodes  after that. "
-"Your can find lots of information on the Freifunk Nord community on "
-"<a href=\"http://nord.freifunk.net/\">our homepage</a>.</p>"
+"<p>The node is currently rebooting and, afterwards, will try to connect to other "
+"nearby Freifunk nodes. "
+"You can find lots more information about the Freifunk Hamburg community on "
+"<a href=\"https://nord.freifunk.net/\">our homepage</a>.</p>"
 "<p>Have fun with your node and exploring the Freifunk network!</p>"
+
+msgid "gluon-config-mode:nopubkey"
+msgstr ""
+"Please enter the name of your node "
+"(<em><%=hostname%></em>) and some additional information at "
+"<a href=\"https://formular.ffnord.net/#/new?hostname=<%=hostname%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.ffnord.net/</a> "
+"."