Skip to content
Snippets Groups Projects
Commit d22cbd2e authored by Leonard Penzer's avatar Leonard Penzer
Browse files

Merge pull request #9 from Philhil/prepare_for_v2015.2 

edit format and add mac of gluon-config-mode:pubkey
parents be91459f 4c47be5f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
i18n/de.po
+ 6
− 4
View file @ d22cbd2e
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2015-05-17 20:28+0100\n" "PO-Revision-Date: 2015-12-27 20:28+0100\n"
"Last-Translator: Leonard Penzer <leonard@penzer.de>\n" "Last-Translator: Leonard Penzer <leonard@penzer.de> Flip <freifunk@philhil.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -28,9 +28,11 @@ msgstr "" ...@@ -28,9 +28,11 @@ msgstr ""
"<small>Ein Klick auf den E-Mail Link müsste&trade; dein E-Mail Programm " "<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>" "öffnen und alle benötigten Informationen in eine neue Mail einfügen.</small></p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= hostname %>" " Name: <%= hostname %>"
" <br/>" " <br/>"
"<%= pubkey %>" " Key: <%= pubkey %>"
" <br/>"
" MAC: <%= sysconfig.primary_mac %>"
"</div>" "</div>"
msgid "gluon-config-mode:reboot" msgid "gluon-config-mode:reboot"
......
i18n/en.po
+ 6
− 4
View file @ d22cbd2e
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2015-05-19 20:28+0100\n" "PO-Revision-Date: 2015-12-27 20:28+0100\n"
"Last-Translator: Leonard Penzer <leonard@penzer.de>\n" "Last-Translator: Leonard Penzer <leonard@penzer.de> Flip <freifunk@philhil.de>\n"
"Language-Team: English\n" "Language-Team: English\n"
"Language: en\n" "Language: en\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -27,9 +27,11 @@ msgstr "" ...@@ -27,9 +27,11 @@ msgstr ""
"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;body=Name%3A%20<%=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<%=hostname%>&amp;body=Name%3A%20<%=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<%=hostname%>&amp;body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">click to send mail</a>. </p>" "<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">click to send mail</a>. </p>"
"<div class=\"the-key\">" "<div class=\"the-key\">"
" # <%= hostname %>" " Name: <%= hostname %>"
" <br/>" " <br/>"
"<%= pubkey %>" " Key: <%= pubkey %>"
" <br/>"
" MAC: <%= sysconfig.primary_mac %>"
"</div>" "</div>"
msgid "gluon-config-mode:reboot" msgid "gluon-config-mode:reboot"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Impressum - Datenschutz