From mboxrd@z Thu Jan  1 00:00:00 1970
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
Message-ID: <555D5BCD-4AC7-44B8-AC17-6E4DA845AFA8@ipfire.org>
In-Reply-To: <fd934b55-ea30-4570-78b7-bab1d754faa8@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4850223703680860532=="
List-Id: <development.lists.ipfire.org>

--===============4850223703680860532==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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=C3=BCller <peter.mueller(a)link38.eu> wrot=
e:
>=20
> Fixes #11881.
>=20
> Signed-off-by: Peter M=C3=BCller <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(-)
>=20
> 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' =3D> 'Keine aktiven Benutzeranmeldungen',
> 'ssh no auth' =3D> 'Sie haben keinerlei Authentifizierungverfahren zugelass=
en; dies wird Ihre Anmeldung verhindern',
> 'ssh passwords' =3D> 'Passwortbasierte Authentifizierung zulassen',
> -'ssh port' =3D> 'SSH-Port auf 222 setzen (Standard ist 22)',
> +'ssh port' =3D> 'SSH-Port auf Standardport 22 setzen (andernfalls 222)',
> 'ssh portfw' =3D> 'TCP-Weiterleitung zulassen',
> 'ssh tempstart15' =3D> 'SSH-Deamon in 15 Minuten beenden',
> 'ssh tempstart30' =3D> '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' =3D> 'No active logins',
> 'ssh no auth' =3D> 'You have not allowed any authentication methods; this w=
ill stop you logging in',
> 'ssh passwords' =3D> 'Allow password based authentication',
> -'ssh port' =3D> 'SSH port set to 222 (default is 22)',
> +'ssh port' =3D> 'Set SSH port to default 22 (222 is used otherwise)',
> 'ssh portfw' =3D> 'Allow TCP forwarding',
> 'ssh tempstart15' =3D> 'Stop SSH demon in 15 minutes',
> 'ssh tempstart30' =3D> 'Stop SSH demon in 30 minutes',
> --=20
> 2.16.4


--===============4850223703680860532==--