Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
ffbs-gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ffbs
ffbs-gluon
Commits
2c2e57ec
Unverified
Commit
2c2e57ec
authored
1 year ago
by
Jan-Niklas Burfeind
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2828 from bobidle/site-example
docs: update sample email addresses in site example
parents
942b4ae7
c6cfa32c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/site-example/i18n/de.po
+2
-2
2 additions, 2 deletions
docs/site-example/i18n/de.po
docs/site-example/i18n/en.po
+3
-3
3 additions, 3 deletions
docs/site-example/i18n/en.po
with
5 additions
and
5 deletions
docs/site-example/i18n/de.po
+
2
−
2
View file @
2c2e57ec
...
...
@@ -49,7 +49,7 @@ msgstr ""
"<%= pubkey %>"
"</div>"
"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich mit "
"anderen Freifunkknoten in seiner Nähe über WLAN sowie über deine"
"anderen Freifunkknoten in seiner Nähe über WLAN sowie über deine
"
"Internetverbindung über das VPN-Gateway zu verbinden.</p>"
"<p>Vergiss nicht das Netzwerkkabel vom LAN Port in den WAN Port "
"umzustecken.</p>"
...
...
@@ -61,7 +61,7 @@ msgstr ""
"Freifunk-Netz aufbauen, wenn andere Freifunk-Knoten in WLAN-Reichweite sind.</p>"
"<p>Bitte schicke uns eine E-Mail mit dem Namen deines Knotens "
"(<em><%= pcdata(hostname) %></em>) und ein paar Informationen an <a href="
"\"mailto:
freifunk-keys@lists.in-kiel.de
?"
"\"mailto:
kontakt@alpha-centauri.freifunk.net
?"
"subject=<%= urlencode('Anmeldung: ' .. hostname) %>&"
"body=<%= urlencode('# ' .. hostname .. '\n# ' .. sysconfig.primary_mac .. '\n# kein mesh-VPN') %>"
"<%= urlencode('\n\nIch habe zur Kenntnis genommen, dass der im ') %>"
...
...
This diff is collapsed.
Click to expand it.
docs/site-example/i18n/en.po
+
3
−
3
View file @
2c2e57ec
...
...
@@ -55,9 +55,9 @@ msgstr ""
"<p>You have selected <strong>not</strong> to use the mesh VPN. "
"Your node will only be able to connect to the Freifunk network if other nodes "
"in reach already have a connection.</p>"
"Please send an e-mail with the name of your node "
"
<p>
Please send an e-mail with the name of your node "
"(<em><%=pcdata(hostname)%></em>) and some additional information to "
"<a href=\"mailto:k
eys
@alpha-centauri.freifunk.net?subject="
"<a href=\"mailto:k
ontakt
@alpha-centauri.freifunk.net?subject="
"<%= urlencode('Registration: ' .. hostname) %>&body="
"<%= urlencode('# ' .. hostname .. '\n# ' .. sysconfig.primary_mac .. '\nkey ') %>"
"%22<%= pubkey %>%22;"
...
...
@@ -65,7 +65,7 @@ msgstr ""
"<%= urlencode('node is publicly available on the Internet and can be ') %>"
"<%= urlencode('used by any services (e.g. the meshviewer map).') %>"
"<%= urlencode('\n\nThanks, \n\n') %>"
"\">k
eys
@alpha-centauri.freifunk.net</a>. Of course, your e-mail address will "
"\">k
ontakt
@alpha-centauri.freifunk.net</a>. Of course, your e-mail address will "
"be treated confidentially and will not be passed on.</p>"
"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
"try to connect to other nearby Freifunk nodes after that.</p>"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment