proxy.cgi: Fix translation string mix-up

Message ID facec48f-a3bd-8240-ad16-6a135f5fe73f@ipfire.org
State New
Headers show
Series proxy.cgi: Fix translation string mix-up | expand

Commit Message

Peter Müller Oct. 10, 2021, 7:49 p.m. UTC
"advproxy advanced web proxy" was meant to be used in the first place,
followed by "advproxy advanced web proxy configuration", as it is done
in other CGIs.

This patch also fixes a missing German translation, and improves
translations of "one X per line" ("eines" != "eins"). :-)

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 html/cgi-bin/proxy.cgi |  4 ++--
 langs/de/cgi-bin/de.pl | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

Patch

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 966593e4d..1805bd8df 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -877,7 +877,7 @@  $checked{'ENABLE_CLAMAV'}{'off'} = '';
 $checked{'ENABLE_CLAMAV'}{'on'} = '';
 $checked{'ENABLE_CLAMAV'}{$proxysettings{'ENABLE_CLAMAV'}} = "checked='checked'";
 
-&Header::openpage($Lang::tr{'advproxy advanced web proxy configuration'}, 1, '');
+&Header::openpage($Lang::tr{'advproxy advanced web proxy'}, 1, '');
 
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
@@ -904,7 +904,7 @@  unless ($proxysettings{'NCSA_EDIT_MODE'} eq 'yes') {
 
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-&Header::openbox('100%', 'left', "$Lang::tr{'advproxy advanced web proxy'}");
+&Header::openbox('100%', 'left', "$Lang::tr{'advproxy advanced web proxy configuration'}");
 
 print <<END
 <table width='100%'>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 70dcb10a6..91e6cfed2 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -251,9 +251,9 @@ 
 'advproxy access' => 'Zugriff',
 'advproxy admin mail' => 'Cache-Administrator E-Mail-Adresse',
 'advproxy advanced proxy' => 'Advanced Proxy',
-'advproxy advanced web proxy' => 'Advanced Web Proxy',
-'advproxy advanced web proxy configuration' => 'Proxy-Konfiguration',
-'advproxy allowed subnets' => 'Erlaubte Subnetze (eins pro Zeile)',
+'advproxy advanced web proxy' => 'Web-Proxy',
+'advproxy advanced web proxy configuration' => 'Web Proxy-Einstellungen',
+'advproxy allowed subnets' => 'Erlaubte Subnetze (eines pro Zeile)',
 'advproxy allowed web browsers' => 'Zulässige Clients für Web-Zugriffe',
 'advproxy back to main page' => 'Zurück zur Hauptseite',
 'advproxy banned ip clients' => 'Gesperrte IP-Adressen (eine pro Zeile)',
@@ -400,7 +400,7 @@ 
 'advproxy wednesday' => 'Mi',
 'advproxy wpad example dst_noproxy_ip' => 'z.B. 192.168.2.0/255.255.255.0',
 'advproxy wpad example dst_noproxy_url' => 'z.B. *.ipfire.org*',
-'advproxy wpad label dst_noproxy_ip' => 'Ausgenommene IP-Subnetze (eins pro Zeile)',
+'advproxy wpad label dst_noproxy_ip' => 'Ausgenommene IP-Subnetze (eines pro Zeile)',
 'advproxy wpad label dst_noproxy_url' => 'Ausgenommene URLs (eine pro Zeile)',
 'advproxy wpad notice' => 'Hinweis: Damit WPAD/PAC korrekt funktioniert, sind weitere Anpassungen erforderlich. Bitte konsultieren Sie das <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a> für weitere Informationen.',
 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD)/Proxy Auto-Config (PAC)',
@@ -2389,7 +2389,7 @@ 
 'tor accounting period monthly' => 'monatlich',
 'tor accounting period weekly' => 'wöchentlich',
 'tor acls' => 'Zugriffskontrolle',
-'tor allowed subnets' => 'Erlaubte Subnetze (eins pro Zeile)',
+'tor allowed subnets' => 'Erlaubte Subnetze (eines pro Zeile)',
 'tor bandwidth burst' => 'Maximaler Spitzenwert (Burst)',
 'tor bandwidth rate' => 'Maximale Bandbreite',
 'tor bandwidth settings' => 'Bandbreiteneinstellungen',