Skip to content
Snippets Groups Projects
Commit 58b6bfb1 authored by Philippe's avatar Philippe
Browse files

Merge branch 'feature/2017.1.x' of...

Merge branch 'feature/2017.1.x' of https://github.com/freifunk-stuttgart/site-ffs into feature/2017.1.x
parents 5215a4d0 58726e42
No related branches found
No related tags found
No related merge requests found
......@@ -24,11 +24,7 @@ msgstr ""
"Deines Heimrouters zu verbinden. Der Knoten wird sich dann selbständig bei dem Stuttgarter Freifunk-Projekt registrieren. "
"Dies kann wenige Minuten dauern, bis der Schlüssel von den Gateways akzeptiert wird. "
"Wenn sich dein Knoten NICHT mit den Mesh-VPNs in Stuttgart verbinden kann, "
"dann schicke bitte diesen Schlüssel, mit den Namen deines Knotens (<em><%=pcdata(hostname)%></em>) und die MAC-Adresse (<em><%=sysconfig.primary_mac%></em>) "
"an <a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=urlencode(hostname)%>&amp;body=Name%3A%20<%=urlencode(hostname)%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a> - "
"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=urlencode(hostname)%>&amp;body=Name%3A%20<%=urlencode(hostname)%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">Email jetzt absenden</a>. "
"<small>Ein Klick auf den E-Mail Link müsste&trade; dein E-Mail Programm "
"öffnen und alle benötigten Informationen in eine neue Mail einfügen.</small></p>"
"dann findest Du <a href=\"https://wiki.freifunk-stuttgart.net/kontakt:mailingliste\">hier</a> Kontaktmöglichkeiten"
"<div class=\"the-key\">"
" Name: <%=pcdata(hostname)%>"
" <br/>"
......
......@@ -22,11 +22,8 @@ msgstr ""
"<p>This is your Freifunk node's public key. Please connect the WAN-Port "
"of your Freifunk node with the LAN-Port of your home router. The node will "
"automatically register at the Freifunk Stuttgart project. This could take "
"a while till all the gateways accept your key. If the node won't be able "
"to connect to the mesh VPN, you have to send the key together with your "
"node's name (<em><%=pcdata(hostname)%></em>) and MAC (<em><%=sysconfig.primary_mac%></em>) to "
"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=New%20Freifunk-Node%3A%20<%=urlencode(hostname)%>&amp;body=Name%3A%20<%=urlencode(hostname)%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a> - "
"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=New%20Freifunk-Node%3A%20<%=urlencode(hostname)%>&amp;body=Name%3A%20<%=urlencode(hostname)%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">click to send mail</a>. </p>"
"a while till all the gateways accept your key. "
"If the node won't be able to connect to the mesh VPN, you can find contact information <a href=\"https://wiki.freifunk-stuttgart.net/kontakt:mailingliste\">here</a> "
"<div class=\"the-key\">"
" Name: <%=pcdata(hostname)%>"
" <br/>"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment