Fixed missing 'Captive' localization string for 'logs.dat'

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' accordingly
to avoid duplicate translation strings.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 137fd686c3f9ad73f17cc401148c20c343390aad..9b27de8727b6993401ace1429e9e1e551b4ef941 100644 (file)
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -23,9 +23,9 @@
                                 'title' => "$Lang::tr{'dhcp server'}",
                                 'enabled' => 1,
                                 };
                                 'title' => "$Lang::tr{'dhcp server'}",
                                 'enabled' => 1,
                                 };

-       $subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive menu'},
+       $subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive'},

                                'uri' => '/cgi-bin/captive.cgi',
                                'uri' => '/cgi-bin/captive.cgi',

-                               'title' => $Lang::tr{'Captive menu'},
+                               'title' => $Lang::tr{'Captive'},

                                'enabled' => 1,
                                };
     $subnetwork->{'40.scheduler'} = {
                                'enabled' => 1,
                                };
     $subnetwork->{'40.scheduler'} = {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 7c1074eddf5aca933c796142ae40a1aebdfcaaa6..07bef906bc099e611e5a11b6b5696bad0e08fa4d 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -8,6 +8,7 @@
 'Add Rule' => 'Regel hinzufügen',
 'Add a route' => 'Eine Route hinzufügen',
 'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs',
 'Add Rule' => 'Regel hinzufügen',
 'Add a route' => 'Eine Route hinzufügen',
 'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs',

+'Captive' => 'Captive-Portal',

 'Captive 1day' => '1 Tag',
 'Captive 1month' => '1 Monat',
 'Captive 1week' => '1 Woche',
 'Captive 1day' => '1 Tag',
 'Captive 1month' => '1 Monat',
 'Captive 1week' => '1 Woche',


@@ -43,7 +44,6 @@
 'Captive logo_upload' => 'Logo hochladen',
 'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' => 'MAC-Adresse',
 'Captive logo_upload' => 'Logo hochladen',
 'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)',
 'Captive mac' => 'MAC-Adresse',

-'Captive menu' => 'Captive-Portal',

 'Captive noexpiretime' => 'Es wurde kein gültiger Verbindungszeitraum angegeben',
 'Captive nolimit' => 'Unbegrenzt',
 'Captive nr' => 'Nummer',
 'Captive noexpiretime' => 'Es wurde kein gültiger Verbindungszeitraum angegeben',
 'Captive nolimit' => 'Unbegrenzt',
 'Captive nr' => 'Nummer',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3940d7b7c776c7dcda238d1b0951c8a4fbcf1c19..a22c4b56677b73fc0e42037c2a88a6a4d40853b4 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -8,6 +8,7 @@
 'Add Rule' => 'Add rule',
 'Add a route' => 'Add a route',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
 'Add Rule' => 'Add rule',
 'Add a route' => 'Add a route',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',

+'Captive' => 'Captive Portal',

 'Captive 1day' => '1 day',
 'Captive 1month' => '1 month',
 'Captive 1week' => '1 week',
 'Captive 1day' => '1 day',
 'Captive 1month' => '1 month',
 'Captive 1week' => '1 week',


@@ -42,7 +43,6 @@
 'Captive logo uploaded' => 'Logo uploaded',
 'Captive logo_set' => 'Current Logo',
 'Captive mac' => 'MAC Address',
 'Captive logo uploaded' => 'Logo uploaded',
 'Captive logo_set' => 'Current Logo',
 'Captive mac' => 'MAC Address',

-'Captive menu' => 'Captive Portal',

 'Captive noexpiretime' => 'No valid connection time range given',
 'Captive nolimit' => 'unlimited',
 'Captive nr' => 'Number',
 'Captive noexpiretime' => 'No valid connection time range given',
 'Captive nolimit' => 'unlimited',
 'Captive nr' => 'Number',