Update translation

Fix some apostrophe and spelling errors

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 72d94868acee75283f24e0ede0bfa0fb858b4e08..71b204526c70fd60cb89cdd0002e2124105138ac 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -233,6 +233,7 @@ WARNING: untranslated string: advproxy errmsg radius port = Invalid RADIUS port
 WARNING: untranslated string: advproxy errmsg radius secret = RADIUS shared secret required
 WARNING: untranslated string: advproxy errmsg radius server = Invalid IP address for RADIUS Server
 WARNING: untranslated string: advproxy errmsg time restriction = Invalid time restriction
 WARNING: untranslated string: advproxy errmsg radius secret = RADIUS shared secret required
 WARNING: untranslated string: advproxy errmsg radius server = Invalid IP address for RADIUS Server
 WARNING: untranslated string: advproxy errmsg time restriction = Invalid time restriction

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet

 WARNING: untranslated string: advproxy error design = Error messages design
 WARNING: untranslated string: advproxy error language = Error messages language
 WARNING: untranslated string: advproxy fake referer = Fake referer submitted to external sites
 WARNING: untranslated string: advproxy error design = Error messages design
 WARNING: untranslated string: advproxy error language = Error messages language
 WARNING: untranslated string: advproxy fake referer = Fake referer submitted to external sites


@@ -301,6 +302,13 @@ WARNING: untranslated string: advproxy username forwarding = Username forwarding
 WARNING: untranslated string: advproxy via forwarding = Proxy address forwarding
 WARNING: untranslated string: advproxy visible hostname = Visible hostname
 WARNING: untranslated string: advproxy wednesday = Wed
 WARNING: untranslated string: advproxy via forwarding = Proxy address forwarding
 WARNING: untranslated string: advproxy visible hostname = Visible hostname
 WARNING: untranslated string: advproxy wednesday = Wed

+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: age second = second
 WARNING: untranslated string: aktiv = Active
 WARNING: untranslated string: album = Album
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: aktiv = Active
 WARNING: untranslated string: album = Album

diff --git a/doc/language_issues.es b/doc/language_issues.es
index f292ebb85a9b60e0f5192cb4ba2c3874524d2502..6a06fd3eb5ca99e19261b68b3d146608ac15e148 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -717,9 +717,17 @@ WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Genera
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet

 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port

+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index e903e017df907f08d199671f046e5e5cb37be0bd..3d82cc542b36693a1c8bb0877082441a8637f3e9 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -781,6 +781,14 @@ WARNING: untranslated string: Daily = Daily
 WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Weekly = Weekly

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)

diff --git a/doc/language_issues.it b/doc/language_issues.it
index c18ff4d2b93babecba254a081d6272f247160ee5..5ad189f8428dd18e59e1eaa99ee69e435a83ccea 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -794,8 +794,16 @@ WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet

 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group

+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: bytes = unknown string

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 509a58f0b733fad693411e8c0433f23174a32e65..fa53ed971d3f91352de4a27acee262c0e2a65580 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -789,8 +789,16 @@ WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication
 WARNING: untranslated string: administrator username = Administrator username
 WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory
 WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet

 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group

+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: block = Block

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index f292ebb85a9b60e0f5192cb4ba2c3874524d2502..6a06fd3eb5ca99e19261b68b3d146608ac15e148 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -717,9 +717,17 @@ WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Genera
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet

 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port

+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index d6fa07a3c70e04f140bc67de3e91cc35df738b7a..10549e001d333be32f3a0ef3b5532cf6a986834e 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -719,9 +719,17 @@ WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Genera
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname
 WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal.

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet

 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port
 WARNING: untranslated string: advproxy group access control = Group based access control
 WARNING: untranslated string: advproxy group required = Required group
 WARNING: untranslated string: advproxy proxy port transparent = Transparent port

+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: age second = second
 WARNING: untranslated string: application layer gateways = Application Layer Gateways
 WARNING: untranslated string: atm device = Device:

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 9a4339db9294c7fe613c52062f3a0a26f51cd93d..9a7dae8b82231089744ed24bd4d7afb1032bafe0 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -782,6 +782,14 @@ WARNING: untranslated string: Daily = Daily
 WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Weekly = Weekly

+WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
+WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.168.2.0/255.255.255.0
+WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org*
+WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line)
+WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line)
+WARNING: untranslated string: 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>.
+WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
+WARNING: untranslated string: advproxy wpad view pac = Open PAC File

 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning

diff --git a/doc/language_missings b/doc/language_missings
index 9d13d47753f02221825b5f9c4064bb87de11eb16..112248713e352c2632773ebad482eac35095eb83 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -72,9 +72,17 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal

+< advproxy errmsg wpad invalid ip or mask

 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent
 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent

+< advproxy wpad example dst_noproxy_ip
+< 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
 < age seconds
 < age shour
 < age second
 < age seconds
 < age shour


@@ -836,6 +844,14 @@
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################

+< advproxy errmsg wpad invalid ip or mask
+< advproxy wpad example dst_noproxy_ip
+< 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

 < cryptographic settings
 < Daily
 < default IP address
 < cryptographic settings
 < Daily
 < default IP address


@@ -895,8 +911,16 @@
 < adsl settings
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
 < adsl settings
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication

+< advproxy errmsg wpad invalid ip or mask

 < advproxy group access control
 < advproxy group required
 < advproxy group access control
 < advproxy group required

+< advproxy wpad example dst_noproxy_ip
+< 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

 < application layer gateways
 < block
 < Captive
 < application layer gateways
 < block
 < Captive


@@ -1160,8 +1184,16 @@
 < advproxy AUTH method ntlm
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication
 < advproxy AUTH method ntlm
 < advproxy AUTH method ntlm auth
 < advproxy basic authentication

+< advproxy errmsg wpad invalid ip or mask

 < advproxy group access control
 < advproxy group required
 < advproxy group access control
 < advproxy group required

+< advproxy wpad example dst_noproxy_ip
+< 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

 < application layer gateways
 < atm device
 < block
 < application layer gateways
 < atm device
 < block


@@ -1487,9 +1519,17 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal

+< advproxy errmsg wpad invalid ip or mask

 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent
 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent

+< advproxy wpad example dst_noproxy_ip
+< 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
 < age seconds
 < age shour
 < age second
 < age seconds
 < age shour


@@ -2250,9 +2290,17 @@
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < advproxy errmsg proxy ports equal

+< advproxy errmsg wpad invalid ip or mask

 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent
 < advproxy group access control
 < advproxy group required
 < advproxy proxy port transparent

+< advproxy wpad example dst_noproxy_ip
+< 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
 < age seconds
 < age shour
 < age second
 < age seconds
 < age shour


@@ -3006,6 +3054,14 @@
 ############################################################################
 # Checking cgi-bin translations for language: tr                           #
 ############################################################################
 ############################################################################
 # Checking cgi-bin translations for language: tr                           #
 ############################################################################

+< advproxy errmsg wpad invalid ip or mask
+< advproxy wpad example dst_noproxy_ip
+< 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

 < crypto error
 < cryptographic settings
 < crypto warning
 < crypto error
 < cryptographic settings
 < crypto warning

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6468fde30a0e7ba97efb2f4a2a8176cb6549245e..6479172d545fa0b36cc4f33d17fafd5960f996f8 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -319,6 +319,7 @@
 'advproxy errmsg radius secret' => 'Shared Secret erforderlich',
 'advproxy errmsg radius server' => 'Ungültige IP-Adresse für den RADIUS-Server',
 'advproxy errmsg time restriction' => 'Ungültige Zeitbeschränkung',
 'advproxy errmsg radius secret' => 'Shared Secret erforderlich',
 'advproxy errmsg radius server' => 'Ungültige IP-Adresse für den RADIUS-Server',
 'advproxy errmsg time restriction' => 'Ungültige Zeitbeschränkung',

+'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Ungültige IP oder Subnetz für ausgenommenes IP-Subnetz',

 'advproxy error design' => 'Design der Fehlermeldungen',
 'advproxy error language' => 'Sprache der Fehlermeldungen',
 'advproxy fake referer' => 'Gefälschter Referer für externe Web-Sites',
 'advproxy error design' => 'Design der Fehlermeldungen',
 'advproxy error language' => 'Sprache der Fehlermeldungen',
 'advproxy fake referer' => 'Gefälschter Referer für externe Web-Sites',


@@ -396,14 +397,13 @@
 'advproxy visible hostname' => 'Sichtbarer Hostname',
 'advproxy web browser' => 'Web-Browser',
 'advproxy wednesday' => 'Mi',
 'advproxy visible hostname' => 'Sichtbarer Hostname',
 'advproxy web browser' => 'Web-Browser',
 'advproxy wednesday' => 'Mi',

-'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)',
-'advproxy wpad label dst_noproxy_url' => 'Ausgenommene URL\'s (eine pro Zeile)',
-'advproxy wpad label dst_noproxy_ip' => 'Ausgenommene IP-Subnetze (eins pro Zeile)',
-'advproxy wpad example dst_noproxy_url' => 'z.B. *.ipfire.org*',

 'advproxy wpad example dst_noproxy_ip' => 'z.B. 192.168.2.0/255.255.255.0',
 'advproxy wpad example dst_noproxy_ip' => 'z.B. 192.168.2.0/255.255.255.0',

-'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Ungültige IP oder Subnetz für ausgenommenes IP-Subnetz',
-'advproxy wpad view pac' => 'PAC-Datei aufrufen',
+'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 in das <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a> schauen.',
 'advproxy wpad notice' => 'Hinweis: Damit WPAD / PAC korrekt funktioniert, sind weitere Anpassungen erforderlich. Bitte in das <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a> schauen.',

+'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)',
+'advproxy wpad view pac' => 'PAC-Datei aufrufen',

 'again' => 'Wiederholung:',
 'age second' => 'Sekunde',
 'age seconds' => 'Sekunden',
 'again' => 'Wiederholung:',
 'age second' => 'Sekunde',
 'age seconds' => 'Sekunden',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 879cff17d39b3c9531c1cbe32e270c363fa399da..c053202b57ec6045267324877315c300cf8e8118 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -319,6 +319,7 @@
 'advproxy errmsg radius secret' => 'RADIUS shared secret required',
 'advproxy errmsg radius server' => 'Invalid IP address for RADIUS Server',
 'advproxy errmsg time restriction' => 'Invalid time restriction',
 'advproxy errmsg radius secret' => 'RADIUS shared secret required',
 'advproxy errmsg radius server' => 'Invalid IP address for RADIUS Server',
 'advproxy errmsg time restriction' => 'Invalid time restriction',

+'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Invalid IP or subnet for excluded IP subnet',

 'advproxy error design' => 'Error messages design',
 'advproxy error language' => 'Error messages language',
 'advproxy fake referer' => 'Fake referer submitted to external sites',
 'advproxy error design' => 'Error messages design',
 'advproxy error language' => 'Error messages language',
 'advproxy fake referer' => 'Fake referer submitted to external sites',


@@ -397,14 +398,13 @@
 'advproxy visible hostname' => 'Visible hostname',
 'advproxy web browser' => 'Web browser',
 'advproxy wednesday' => 'Wed',
 'advproxy visible hostname' => 'Visible hostname',
 'advproxy web browser' => 'Web browser',
 'advproxy wednesday' => 'Wed',

-'advproxy wpad title' => 'Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)',
-'advproxy wpad label dst_noproxy_url' => 'Excluded URL\'s (one per line)',
-'advproxy wpad label dst_noproxy_ip' => 'Excluded IP-Subnets (one per line)',
-'advproxy wpad example dst_noproxy_url' => 'e.g. *.ipfire.org*',

 'advproxy wpad example dst_noproxy_ip' => 'e.g. 192.168.2.0/255.255.255.0',
 'advproxy wpad example dst_noproxy_ip' => 'e.g. 192.168.2.0/255.255.255.0',

-'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Invalid IP or subnet for excluded IP-subnet',
-'advproxy wpad view pac' => 'Open PAC-File',
-'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 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:',
 'age second' => 'second',
 'age seconds' => 'seconds',
 'again' => 'Again:',
 'age second' => 'second',
 'age seconds' => 'seconds',