Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
58d79845
Commit
58d79845
authored
Jul 20, 2016
by
Dominik Hebeler
Browse files
Merge branch 'TextuelleFehler' into 'development'
Textuelle fehler See merge request
!170
parents
c089f074
8ec48266
Changes
3
Hide whitespace changes
Inline
Side-by-side
resources/lang/de/kontakt.php
View file @
58d79845
...
...
@@ -3,7 +3,7 @@
return
[
'headline.1'
=>
'Kontakt'
,
'headline.2'
=>
'Forum'
,
'headline.3'
=>
'Bitte stellen Sie
Ihr
e Frage zuerst in unserem'
,
'headline.3'
=>
'Bitte stellen Sie
technisch
e Frage
n
zuerst in unserem
<a href="http://forum.suma-ev.de/" target="_blank">Forum</a>
'
,
'headline.4'
=>
'So können auch andere von einer Antwort profitieren.'
,
'form.1'
=>
'Sicheres Kontakformular'
,
...
...
@@ -18,8 +18,8 @@ Dafür wird Javascript benötigt.',
'form.8'
=>
'Falls Sie Javascript deaktiviert haben, wird Ihre Eingabe unverschlüsselt gesendet.'
,
'form.9'
=>
'Verschlüsseln und senden'
,
'mail.1'
=>
'Per E
-M
ail'
,
'mail.2'
=>
'Sie können uns auch direkt eine e
-
mail an die folgende Adresse schicken:'
,
'mail.1'
=>
'Per E
m
ail'
,
'mail.2'
=>
'Sie können uns auch direkt eine email an die folgende Adresse schicken:'
,
'mail.3'
=>
'Falls Sie diese verschlüsseln wollen, finden Sie nachfolgend unseren öffentlichen OpenPGP-Schlüssel:'
,
'letter.1'
=>
'Per Brief-Post'
,
...
...
resources/lang/en/kontakt.php
View file @
58d79845
...
...
@@ -3,11 +3,11 @@
return
[
'headline.1'
=>
'Contact'
,
'headline.2'
=>
'Forum'
,
'headline.3'
=>
'
Please ask your question first at our
'
,
'headline.4'
=>
'
T
his way others can benefit from an answer.'
,
'headline.3'
=>
'
If you have a technical question, ask it at our <a href="http://forum.suma-ev.de/" target="_blank">board</a> first, please
'
,
'headline.4'
=>
'
By t
his way others can benefit from an answer.'
,
'form.1'
=>
'Secure Contact Form'
,
'form.2'
=>
'Via this form you can contact us encrypted'
,
'form.2'
=>
'Via this form you can contact us
by
encrypted'
,
'form.3'
=>
'.'
,
'form.4'
=>
'Please note that due to a lot of requests we are personnel-wise not able to answer everything promptly.'
,
'form.5'
=>
'If you do not enter an email-adress, we can not answer you.'
,
...
...
@@ -17,9 +17,9 @@ We use Javascript for this.',
'form.8'
=>
'If you have Javascript disabled, your message will be send unencrypted.'
,
'form.9'
=>
'Encrypt and send'
,
'mail.1'
=>
'By E
-M
ail'
,
'mail.2'
=>
'You can also e
-
mail us directly at:'
,
'mail.3'
=>
'If you want to encrypt your e
-
mail
aswell, the
following
is our
public OpenPGP-Key:'
,
'mail.1'
=>
'By E
m
ail'
,
'mail.2'
=>
'You can also email us directly at:'
,
'mail.3'
=>
'If you want to encrypt your email
you can use our
following public OpenPGP-Key:'
,
'letter.1'
=>
'By Letter Mail'
,
'letter.2'
=>
'We prefer digital contact. However, if you consider it neccessary to contact us postally, you can mail us at:'
,
...
...
resources/views/kontakt/kontakt.blade.php
View file @
58d79845
...
...
@@ -5,7 +5,7 @@
@
section
(
'content'
)
<
h1
>
{{
trans
(
'kontakt.headline.1'
)
}}
</
h1
>
<
h2
>
{{
trans
(
'kontakt.headline.2'
)
}}
</
h2
>
<
p
><
span
class
=
"bold"
>
{
{
trans
(
'kontakt.headline.3'
)
}}
<
a
href
=
"http://forum.suma-ev.de/"
target
=
"_blank"
>
Forum
.
</
a
>
</
span
>
<
p
><
span
class
=
"bold"
>
{
!!
trans
(
'kontakt.headline.3'
)
!!
}
</
span
>
<
span
>
{{
trans
(
'kontakt.headline.4'
)
}}
</
span
></
p
>
<
h2
>
{{
trans
(
'kontakt.form.1'
)
}}
</
h2
>
<
p
>
{{
trans
(
'kontakt.form.2'
)
}}
<
a
href
=
"mailto:office@suma-ev.de"
>
email
</
a
>
{{
trans
(
'kontakt.form.3'
)
}}
</
p
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment