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] fix SSH port description in WebUI again
Date: Thu, 03 Jan 2019 18:09:36 +0000	[thread overview]
Message-ID: <555D5BCD-4AC7-44B8-AC17-6E4DA845AFA8@ipfire.org> (raw)
In-Reply-To: <fd934b55-ea30-4570-78b7-bab1d754faa8@link38.eu>

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

Yay. Merged.

@Translation list: Are you aware of this and would you update your respective translations, please?

Best,
-Michael

> On 3 Jan 2019, at 16:57, Peter Müller <peter.mueller(a)link38.eu> wrote:
> 
> Fixes #11881.
> 
> Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
> ---
> langs/de/cgi-bin/de.pl | 2 +-
> langs/en/cgi-bin/en.pl | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index 0ca760f52..2f3ed41bc 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -2167,7 +2167,7 @@
> 'ssh no active logins' => 'Keine aktiven Benutzeranmeldungen',
> 'ssh no auth' => 'Sie haben keinerlei Authentifizierungverfahren zugelassen; dies wird Ihre Anmeldung verhindern',
> 'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen',
> -'ssh port' => 'SSH-Port auf 222 setzen (Standard ist 22)',
> +'ssh port' => 'SSH-Port auf Standardport 22 setzen (andernfalls 222)',
> 'ssh portfw' => 'TCP-Weiterleitung zulassen',
> 'ssh tempstart15' => 'SSH-Deamon in 15 Minuten beenden',
> 'ssh tempstart30' => 'SSH-Deamon in 30 Minuten beenden',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 465738b96..258176970 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -2205,7 +2205,7 @@
> 'ssh no active logins' => 'No active logins',
> 'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in',
> 'ssh passwords' => 'Allow password based authentication',
> -'ssh port' => 'SSH port set to 222 (default is 22)',
> +'ssh port' => 'Set SSH port to default 22 (222 is used otherwise)',
> 'ssh portfw' => 'Allow TCP forwarding',
> 'ssh tempstart15' => 'Stop SSH demon in 15 minutes',
> 'ssh tempstart30' => 'Stop SSH demon in 30 minutes',
> -- 
> 2.16.4


      reply	other threads:[~2019-01-03 18:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-03 16:57 Peter Müller
2019-01-03 18:09 ` Michael Tremer [this message]

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=555D5BCD-4AC7-44B8-AC17-6E4DA845AFA8@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