Changeset 31880 for main/trunk/greenstone2/perllib/strings.properties

Timestamp:

2017-08-14T22:23:04+12:00 (7 years ago)

Author:

ak19

Message:

All the changes that were required to set up multiple proxy servers, one for HTTP, one for HTTPS, one for FTP. Still need to test on Windows

File:

• main/trunk/greenstone2/perllib/strings.properties (modified) (2 diffs)

main/trunk/greenstone2/perllib/strings.properties

@@ -1336 +1336 @@
 WebDownload.html_only:Download only HTML files, and ignore associated files e.g images and stylesheets
 WebDownload.html_only_disp:Only HTML files
-WebDownload.proxied_connect_failed_info:Current proxy settings are:\n- host=%s\n- port=%s
+WebDownload.proxied_connect_failed_info:Current proxy settings are:
+WebDownload.http_proxy_settings:- HTTP host=%s : port=%s
+WebDownload.https_proxy_settings:- HTTPS host=%s : port=%s
+WebDownload.ftp_proxy_settings:- FTP host=%s : port=%s
 WebDownload.proxyless_connect_failed_info:- The external server might not be responding\n- or you might need to switch on proxy settings
 WebDownload.connect_failed_info:- or try ticking No Certificate Checking (affects 'https' URLs)\nin File > Preferences > Connection
@@ -1342 +1345 @@
 WgetDownload.desc: Base class that handles calls to wget
 WgetDownload.proxy_on:Proxy on
-WgetDownload.proxy_host:Proxy host
-WgetDownload.proxy_port:Proxy port
+WgetDownload.http_proxy_host:HTTP proxy host
+WgetDownload.http_proxy_port:HTTP proxy port
+WgetDownload.https_proxy_host:HTTPS proxy host
+WgetDownload.https_proxy_port:HTTPS proxy port
+WgetDownload.ftp_proxy_host:FTP proxy host
+WgetDownload.ftp_proxy_port:FTP proxy port
 WgetDownload.user_name:User name
 WgetDownload.user_password:User password