diff options
Diffstat (limited to 'lib/plugins')
| -rw-r--r-- | lib/plugins/config/lang/en/lang.php | 11 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index dd13464fe..66e5b00e0 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -157,11 +157,12 @@ $lang['target____media'] = 'Target window for media links'; $lang['target____windows'] = 'Target window for windows links'; /* Proxy Options */ -$lang['proxy____host'] = 'Proxy servername'; -$lang['proxy____port'] = 'Proxy port'; -$lang['proxy____user'] = 'Proxy user name'; -$lang['proxy____pass'] = 'Proxy password'; -$lang['proxy____ssl'] = 'Use ssl to connect to Proxy'; +$lang['proxy____host'] = 'Proxy servername'; +$lang['proxy____port'] = 'Proxy port'; +$lang['proxy____user'] = 'Proxy user name'; +$lang['proxy____pass'] = 'Proxy password'; +$lang['proxy____ssl'] = 'Use SLL to connect to proxy'; +$lang['proxy____except'] = 'Regular expression to match URLs for which the proxy should be skipped for.'; /* Safemode Hack */ $lang['safemodehack'] = 'Enable safemode hack'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 316b4d1c5..edba65262 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -197,6 +197,7 @@ $meta['proxy____port'] = array('numericopt'); $meta['proxy____user'] = array('string'); $meta['proxy____pass'] = array('password','_code' => 'base64'); $meta['proxy____ssl'] = array('onoff'); +$meta['proxy____except'] = array('string'); $meta['safemodehack'] = array('onoff'); $meta['ftp____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i'); $meta['ftp____port'] = array('numericopt'); |