public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2 2/2] update language files for mail.cgi changes
Date: Tue, 04 Feb 2020 10:22:20 +0000	[thread overview]
Message-ID: <B9425F4B-4BDD-46BA-85D7-E7BFDF0483C5@ipfire.org> (raw)
In-Reply-To: <f05e49d2-0538-1889-551b-85438b31f803@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 1763 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 3 Feb 2020, at 18:35, Peter Müller <peter.mueller(a)ipfire.org> wrote:
> 
> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
> ---
> langs/de/cgi-bin/de.pl | 6 ++++--
> langs/en/cgi-bin/en.pl | 4 +++-
> 2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index 80579e7cc..2ef7b673b 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -933,8 +933,10 @@
> 'email subject' => 'IPFire Test-E-Mail',
> 'email success' => 'Test-E-Mail erfolgreich versendet',
> 'email testmail' => 'Testnachricht senden',
> -'email text' => 'Testnachricht vom IPFire Mailversand.',
> -'email tls' => 'TLS aktivieren',
> +'email text' => 'Testnachricht vom IPFire-Mailversandsystem.',
> +'email tls' => 'Transportverschlüsselungsmodus',
> +'email tls explicit' => 'explizit (STARTTLS)',
> +'email tls implicit' => 'implizit (TLS)',
> 'email usemail' => 'Mailversand aktivieren',
> 'emailreportlevel' => 'E-Mail-Reportlevel',
> 'empty' => 'Dieses Feld kann leer bleiben',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 1f81108f1..24790d689 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -975,7 +975,9 @@
> 'email success' => 'Test message successfully sent',
> 'email testmail' => 'Send test mail',
> 'email text' => 'Test mail from IPFire Mail Service',
> -'email tls' => 'Use TLS',
> +'email tls' => 'TLS mode',
> +'email tls explicit' => 'explicit (STARTTLS)',
> +'email tls implicit' => 'implicit (TLS)',
> 'email usemail' => 'Activate Mail Service',
> 'emailreportlevel' => 'E-mailreportlevel',
> 'emerging pro rules' => 'Emergingthreats.net Pro Rules',
> -- 
> 2.16.4


  reply	other threads:[~2020-02-04 10:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-03 18:35 [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Peter Müller
2020-02-03 18:35 ` [PATCH v2 2/2] update language files for mail.cgi changes Peter Müller
2020-02-04 10:22   ` Michael Tremer [this message]
2020-02-04 10:22 ` [PATCH v2 1/2] mail.cgi: add support for implicit TLS usage Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=B9425F4B-4BDD-46BA-85D7-E7BFDF0483C5@ipfire.org \
    --to=michael.tremer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox