From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Fixed missing 'Captive' localization string for 'logs.dat'
Date: Tue, 09 Jan 2018 14:11:33 +0100
Message-ID: <20180109131133.7947-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0643477084798704282=="
List-Id: <development.lists.ipfire.org>

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

Added 'Captive' localization string in 'de/en.pl'.

After a fresh install of Core 117, the system log shows a blank line
for 'Captive Portal' entries.

Deleted translation for 'Captive menu' and changed '30-network.menu' accordin=
gly
to avoid duplicate translation strings.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/menu/30-network.menu | 4 ++--
 langs/de/cgi-bin/de.pl      | 2 +-
 langs/en/cgi-bin/en.pl      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 137fd686c..9b27de872 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -23,9 +23,9 @@
 				 'title' =3D> "$Lang::tr{'dhcp server'}",
 				 'enabled' =3D> 1,
 				 };
-	$subnetwork->{'32.captive'} =3D {'caption' =3D> $Lang::tr{'Captive menu'},
+	$subnetwork->{'32.captive'} =3D {'caption' =3D> $Lang::tr{'Captive'},
 			        'uri' =3D> '/cgi-bin/captive.cgi',
-			        'title' =3D> $Lang::tr{'Captive menu'},
+			        'title' =3D> $Lang::tr{'Captive'},
 			        'enabled' =3D> 1,
 			        };
     $subnetwork->{'40.scheduler'} =3D {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 7c1074edd..07bef906b 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -8,6 +8,7 @@
 'Add Rule' =3D> 'Regel hinzuf=C3=BCgen',
 'Add a route' =3D> 'Eine Route hinzuf=C3=BCgen',
 'Async logging enabled' =3D> 'Aktiviere asynchrones Schreiben des Syslogs',
+'Captive' =3D> 'Captive-Portal',
 'Captive 1day' =3D> '1 Tag',
 'Captive 1month' =3D> '1 Monat',
 'Captive 1week' =3D> '1 Woche',
@@ -43,7 +44,6 @@
 'Captive logo_upload' =3D> 'Logo hochladen',
 'Captive logo_upload1' =3D> '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' =3D> 'MAC-Adresse',
-'Captive menu' =3D> 'Captive-Portal',
 'Captive noexpiretime' =3D> 'Es wurde kein g=C3=BCltiger Verbindungszeitraum=
 angegeben',
 'Captive nolimit' =3D> 'Unbegrenzt',
 'Captive nr' =3D> 'Nummer',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3940d7b7c..a22c4b566 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -8,6 +8,7 @@
 'Add Rule' =3D> 'Add rule',
 'Add a route' =3D> 'Add a route',
 'Async logging enabled' =3D> 'Enable asynchronous writing of the syslog file=
',
+'Captive' =3D> 'Captive Portal',
 'Captive 1day' =3D> '1 day',
 'Captive 1month' =3D> '1 month',
 'Captive 1week' =3D> '1 week',
@@ -42,7 +43,6 @@
 'Captive logo uploaded' =3D> 'Logo uploaded',
 'Captive logo_set' =3D> 'Current Logo',
 'Captive mac' =3D> 'MAC Address',
-'Captive menu' =3D> 'Captive Portal',
 'Captive noexpiretime' =3D> 'No valid connection time range given',
 'Captive nolimit' =3D> 'unlimited',
 'Captive nr' =3D> 'Number',
--=20
2.15.1


--===============0643477084798704282==--