From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Fixed missing 'Captive' localization string for 'logs.dat' Date: Tue, 09 Jan 2018 14:59:04 +0000 Message-ID: <1515509944.3685.103.camel@ipfire.org> In-Reply-To: <20180109131133.7947-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1438108773771007501==" List-Id: --===============1438108773771007501== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thank you. On Tue, 2018-01-09 at 14:11 +0100, Matthias Fischer wrote: > Added 'Captive' localization string in 'de/en.pl'. >=20 > After a fresh install of Core 117, the system log shows a blank line > for 'Captive Portal' entries. There should be a list with all missing strings that should find things like this: https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Ddoc/language_issues.e= n;h=3D48a85d0036ab5d5346e8a8a34ef25d018bef2dfd;hb=3DHEAD > Deleted translation for 'Captive menu' and changed '30-network.menu' > accordingly > to avoid duplicate translation strings. >=20 > Best, > Matthias >=20 > Signed-off-by: Matthias Fischer > --- > 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(-) >=20 > 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 Verbindungszeitra= um > 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 fi= le', > +'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', --===============1438108773771007501== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxwVTJMZ0FDZ2tRZ0hudy8yK1EKQ1FkMVl4QUFvd3pCOHpjcDYx Tlh4THZpZlNuOWZZbTh6b2RHMGZubFBmZTczcEJWU3BCSmhSY0RJOTZnVnFYaApEUDBiZStIYUxE UE4xek9FMmF5KzU4L3cxZDBZMGM4UmFSMHpPSUY3TXVUU2RLOWZtMEZlVDZGTXFoSEtnTzJlCmFk Vlp6N1FQRWNUVjFYdEl2UDJjWkowWVdrVjBxNXlwTmF1d0xxNWorK2J5L3dFbjh6dFR4N1puU0E2 Q0NmaEYKV1J5SXhveDM0V1lMZzJScDk5MndpWHlScmcxWVZpc2dVZHJLUnhCUmMvYk4yRDVIMG12 MmRXZWYyUTQvdFgzTgoza0tiQVZ2UXpsL3BVQTVJeHU0d2RLVUs2aFQrTVNZczBtN1poS1VhdFYv dzZqcEc2UGozYVFvQmVlY1hQOHBYClZ1NGJhb3JMZ25Ob3JEUUp6UjRibTBmTzF1R2dKYjBHekYy Vldxd1lRaElaWEJLVnBHNlFZK3JCUXE3b0pVYWUKQWkxZllLWExjQkxMSjROOWNBZWV5VEJreTlP RW1ETkZUdU1tTmhndWcwNlpRaVJxTkppRy8xekFobFdaeDh2WgpzSWloVjgrUUJEcXBxZHM3OUVj L1huZVhLRzBhN3RMa3UrOVF5UUVWdHRoME5LeStpcFE0cTYyVXZMakp2SzNuCmpkeWRmVkUxNGR0 WDZEVGcvRDNEL0Q3LzFmVDJvRktDcTFsaTdlcFhFRWZobjFHS0NXOUFDVkhyYnVuS2E1NlgKRXJN WnM4eWp3VTJiMGhIeXNYZGY2a2R3UGx6L3JFWkRVUkFUMVFoaWV6VDdtc2liejYrNm1hMXRUZ0NL bkpuMQplTGtKRmFOS3R2eUNJNTZPS3RlZFRmYm1KV1U0KytPMEoyZlBtUERaODZJWlVENlBPMXc9 Cj1TSjJ5Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============1438108773771007501==--