From patchwork Sun Oct 10 19:49:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4784 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HSCFG2DcBz44S9 for ; Sun, 10 Oct 2021 19:49:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HSCFD3ZQjz3WV; Sun, 10 Oct 2021 19:49:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HSCFD2XH9z2yCW; Sun, 10 Oct 2021 19:49:52 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HSCFC2D92z2xRJ for ; Sun, 10 Oct 2021 19:49:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HSCFB2XW1z1KX for ; Sun, 10 Oct 2021 19:49:50 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1633895390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPiiadRyp+Uj/e8ZB2e3RxfaKWxd86Ep4YAoyrYio78=; b=sQYXedRevJ7JjIxUuqbdB92ts+znOKMRpI7kVTVLZ6yfT8aCNXctKHAvpmvgwHlawyKe1P CVxL6Gcqc9cgo4Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1633895390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPiiadRyp+Uj/e8ZB2e3RxfaKWxd86Ep4YAoyrYio78=; b=pP2pTGjUslE0LCyqtKWLcrTHU49i9RwW51RJFYMSEH/Uhf8ZtzTWltsnFpkXuZUSO37ZUV AvhloSGVR9ubz6jym0XHUQ5nu/vOCR8Eemd/sLjHlWOkure828hpg4QSHMrJ52mhZNsn4x vt6NEPu+PfTJt2335WNyqkgbQIwaqRSyRIVWLB8jJIZZvHBK7dNuetQPfQupGqGVc3rrZ5 bm9BFPJICF5FNicJj+sAw+H1Lv0F9C1gHDI7QXKM7BDTnOr4TZe5Ir1FkezAeMkvn28dPe MUrIcBlIYrk7n5IcsPcEiOt0n1HZr8HIhY2XYKgvl1h8ONUuxhhziZqfVC7YKw== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] proxy.cgi: Fix translation string mix-up Message-ID: Date: Sun, 10 Oct 2021 21:49:49 +0200 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" "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 --- html/cgi-bin/proxy.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) 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 "
\n"; -&Header::openbox('100%', 'left', "$Lang::tr{'advproxy advanced web proxy'}"); +&Header::openbox('100%', 'left', "$Lang::tr{'advproxy advanced web proxy configuration'}"); print < 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 Wiki 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',