Language files: Fixes bug#12701 - Line removed from proxy.cgi no longer needed in...

- v2 version that has only the removed line in the language files diffs
- Line removed from de, en, es & fr
- No translations had been done for the other languages for that line.

Fixes: Bug#12701
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3ba7b4bcff7bb6b900342d051d53f6b27a571582..39241619271705403c3919555c4640e189731e2f 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -103,7 +103,6 @@ WARNING: translation string unused: advproxy throttle dskimg
 WARNING: translation string unused: advproxy throttle mmedia
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: advproxy web browser
-WARNING: translation string unused: advproxy wpad notice
 WARNING: translation string unused: again
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour

diff --git a/doc/language_issues.es b/doc/language_issues.es
index e84e38a87e2790fe3d919a2d960279c1d0492232..501f607647e1860ac5989137d60fe91fbf742b3f 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -105,7 +105,6 @@ WARNING: translation string unused: advproxy throttle mmedia
 WARNING: translation string unused: advproxy update information
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: advproxy web browser
-WARNING: translation string unused: advproxy wpad notice
 WARNING: translation string unused: again
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 7677e61c3389faef715dfa0440de2b30feb06be3..bbf686b74e9a7a9c97fc3e30f656a384b3aa26a3 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -108,7 +108,6 @@ WARNING: translation string unused: advproxy throttle mmedia
 WARNING: translation string unused: advproxy update information
 WARNING: translation string unused: advproxy update notification
 WARNING: translation string unused: advproxy web browser
-WARNING: translation string unused: advproxy wpad notice
 WARNING: translation string unused: again
 WARNING: translation string unused: age seconds
 WARNING: translation string unused: age shour

diff --git a/doc/language_missings b/doc/language_missings
index 72c724243ec45d73e1ce69e43794cb840179bdc0..1b4e231e2898c8589ce39caf209a677065887a74 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -157,7 +157,6 @@
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
 < advproxy wpad label dst_noproxy_url
-< advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
 < aliases default interface
@@ -662,7 +661,6 @@
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
 < advproxy wpad label dst_noproxy_url
-< advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
 < aliases default interface
@@ -1202,7 +1200,6 @@
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
 < advproxy wpad label dst_noproxy_url
-< advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
 < age second
@@ -2181,7 +2178,6 @@
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
 < advproxy wpad label dst_noproxy_url
-< advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
 < age second
@@ -3150,7 +3146,6 @@
 < advproxy wpad example dst_noproxy_url
 < advproxy wpad label dst_noproxy_ip
 < advproxy wpad label dst_noproxy_url
-< advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
 < aliases default interface

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a57b62ad8f0dd893500cca5310dfdbf959664a6c..33730f0c319d8f3ae1b6cffc88db42d0d558cf46 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -410,7 +410,6 @@
 '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_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)',
 'advproxy wpad view pac' => 'PAC-Datei aufrufen',
 'again' => 'Wiederholung:',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index cc7704e9dcf1c06dbbaccbb174743c197d2195a7..729516538bcf40fc40007f92d4a2d0779fe2807f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -412,7 +412,6 @@
 'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*',
 'advproxy wpad label dst_noproxy_ip' => 'Excluded IP Subnets (one per line)',
 'advproxy wpad label dst_noproxy_url' => 'Excluded URL s (one per line)',
-'advproxy wpad notice' => 'Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.',
 'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)',
 'advproxy wpad view pac' => 'Open PAC File',
 'again' => 'Again:',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 3daca873cfd242641afa20e5c78dff021b2bfeac..2e85a5b2798a9b46ba5ad9515e47fc5acc6bdf4e 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -409,7 +409,6 @@
 'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*',
 'advproxy wpad label dst_noproxy_ip' => 'Subredes IP excluidas (una por línea)',
 'advproxy wpad label dst_noproxy_url' => 'URL excluidas (una por línea)',
-'advproxy wpad notice' => 'Aviso: Para que WPAD/PAC funcione correctamente, es necesario realizar más cambios. Consulte <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.',
 'advproxy wpad title' => 'Protocolo de detección automática de proxy web (WPAD)/Configuración automática de proxy (PAC)',
 'advproxy wpad view pac' => 'Abrir archivo PAC',
 'again' => 'Otra vez:',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index b09b8673e18ad4019576027b82f6bee3fcde92d5..6ef4075a1eaaee995d48c5a0a574854a540497ef 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -415,7 +415,6 @@
 'advproxy wpad example dst_noproxy_url' => 'Ex. : *.ipfire.org*',
 'advproxy wpad label dst_noproxy_ip' => 'Sous-réseaux IP exclus (un par ligne) ',
 'advproxy wpad label dst_noproxy_url' => 'URL exclus (une par ligne) ',
-'advproxy wpad notice' => 'Note : Pour le fonctionnement correct de WPAD/PAC, d\'autres modifications doivent être apportées. Veuillez consulter le <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.',
 'advproxy wpad title' => 'Protocole de détection automatique du proxy web (WPAD) / config automatique du proxy (PAC)',
 'advproxy wpad view pac' => 'Ouvrir fichier PAC ',
 'again' => 'De nouveau :',