Web Browser (NG), Safe Browsing: added support for the Google Safe Browsing Lookup API (v4)

Wed, 11 Apr 2018 19:57:23 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 11 Apr 2018 19:57:23 +0200
changeset 6233
a64b986abb54
parent 6232
d2eac9616a92
child 6234
fb1f9e681848

Web Browser (NG), Safe Browsing: added support for the Google Safe Browsing Lookup API (v4)

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.WebBrowser.SafeBrowsing.html file | annotate | diff | comparison | revisions
WebBrowser/Download/DownloadManager.py file | annotate | diff | comparison | revisions
WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py file | annotate | diff | comparison | revisions
WebBrowser/SafeBrowsing/SafeBrowsingDialog.py file | annotate | diff | comparison | revisions
WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui file | annotate | diff | comparison | revisions
WebBrowser/SafeBrowsing/SafeBrowsingManager.py file | annotate | diff | comparison | revisions
WebBrowser/WebBrowserPage.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.qm file | annotate | diff | comparison | revisions
i18n/eric6_de.ts file | annotate | diff | comparison | revisions
i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
i18n/eric6_en.ts file | annotate | diff | comparison | revisions
i18n/eric6_es.ts file | annotate | diff | comparison | revisions
i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
i18n/eric6_it.ts file | annotate | diff | comparison | revisions
i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Tue Apr 10 19:43:45 2018 +0200
+++ b/APIs/Python3/eric6.api	Wed Apr 11 19:57:23 2018 +0200
@@ -11664,10 +11664,10 @@
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.getThreatMessage?4(threatType)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.getThreatType?4(threatType)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.getThreatsUpdate?4(clientStates)
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.lookupUrl?4(url, platforms)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.networkError?7
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.setApiKey?4(apiKey)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient?1(apiKey, fairUse=True, parent=None)
-eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.HashPrefixList?1(prefixLength, rawHashes)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.SafeBrowsingCache.addThreatList?4(threatList)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.SafeBrowsingCache.cleanupFullHashes?4(keepExpiredFor=43200)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.SafeBrowsingCache.close?4()
@@ -11698,9 +11698,6 @@
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.SafeBrowsingCache.updateHashPrefixExpiration?4(threatList, hashPrefix, negativeCacheDuration)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.SafeBrowsingCache.updateThreatListClientState?4(threatList, clientState)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.SafeBrowsingCache?1(dbPath, parent=None)
-eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.ThreatList.asTuple?4()
-eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.ThreatList.fromApiEntry?4(entry)
-eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.ThreatList?1(threatType, platformType, threatEntryType)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.closeEvent?4(evt)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_buttonBox_clicked?4(button)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_clearCacheButton_clicked?4()
@@ -11741,6 +11738,10 @@
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.showSafeBrowsingDialog?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.updateHashPrefixCache?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager?1()
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.HashPrefixList?1(prefixLength, rawHashes)
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.ThreatList.asTuple?4()
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.ThreatList.fromApiEntry?4(entry)
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.ThreatList?1(threatType, platformType, threatEntryType)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.SafeBrowsingUrl.canonical?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.SafeBrowsingUrl.digest?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.SafeBrowsingUrl.fullUnescape?4()
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Tue Apr 10 19:43:45 2018 +0200
+++ b/Documentation/Help/source.qhp	Wed Apr 11 19:57:23 2018 +0200
@@ -1362,6 +1362,7 @@
               <section title="eric6.WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget.html" />
               <section title="eric6.WebBrowser.SafeBrowsing.SafeBrowsingLabel" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingLabel.html" />
               <section title="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html" />
+              <section title="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html" />
               <section title="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.html" />
               <section title="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUtilities" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUtilities.html" />
               <section title="eric6.WebBrowser.SafeBrowsing.__init__" ref="eric6.WebBrowser.SafeBrowsing.__init__.html" />
@@ -7543,10 +7544,10 @@
       <keyword name="HTMLGenerator" id="HTMLGenerator" ref="eric6.QScintilla.Exporters.ExporterHTML.html#HTMLGenerator" />
       <keyword name="HTMLGenerator (Constructor)" id="HTMLGenerator (Constructor)" ref="eric6.QScintilla.Exporters.ExporterHTML.html#HTMLGenerator.__init__" />
       <keyword name="HTMLGenerator.generate" id="HTMLGenerator.generate" ref="eric6.QScintilla.Exporters.ExporterHTML.html#HTMLGenerator.generate" />
-      <keyword name="HashPrefixList" id="HashPrefixList" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#HashPrefixList" />
-      <keyword name="HashPrefixList (Constructor)" id="HashPrefixList (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#HashPrefixList.__init__" />
-      <keyword name="HashPrefixList.__iter__" id="HashPrefixList.__iter__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#HashPrefixList.__iter__" />
-      <keyword name="HashPrefixList.__len__" id="HashPrefixList.__len__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#HashPrefixList.__len__" />
+      <keyword name="HashPrefixList" id="HashPrefixList" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList" />
+      <keyword name="HashPrefixList (Constructor)" id="HashPrefixList (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList.__init__" />
+      <keyword name="HashPrefixList.__iter__" id="HashPrefixList.__iter__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList.__iter__" />
+      <keyword name="HashPrefixList.__len__" id="HashPrefixList.__len__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList.__len__" />
       <keyword name="HashableWrapper" id="HashableWrapper" ref="eric6.Utilities.binplistlib.html#HashableWrapper" />
       <keyword name="HashableWrapper (Constructor)" id="HashableWrapper (Constructor)" ref="eric6.Utilities.binplistlib.html#HashableWrapper.__init__" />
       <keyword name="HashableWrapper.__repr__" id="HashableWrapper.__repr__" ref="eric6.Utilities.binplistlib.html#HashableWrapper.__repr__" />
@@ -13750,6 +13751,7 @@
       <keyword name="SafeBrowsingAPIClient.getThreatMessage" id="SafeBrowsingAPIClient.getThreatMessage" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.getThreatMessage" />
       <keyword name="SafeBrowsingAPIClient.getThreatType" id="SafeBrowsingAPIClient.getThreatType" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.getThreatType" />
       <keyword name="SafeBrowsingAPIClient.getThreatsUpdate" id="SafeBrowsingAPIClient.getThreatsUpdate" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.getThreatsUpdate" />
+      <keyword name="SafeBrowsingAPIClient.lookupUrl" id="SafeBrowsingAPIClient.lookupUrl" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.lookupUrl" />
       <keyword name="SafeBrowsingAPIClient.setApiKey" id="SafeBrowsingAPIClient.setApiKey" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.setApiKey" />
       <keyword name="SafeBrowsingCache" id="SafeBrowsingCache" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#SafeBrowsingCache" />
       <keyword name="SafeBrowsingCache (Constructor)" id="SafeBrowsingCache (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#SafeBrowsingCache.__init__" />
@@ -13809,6 +13811,7 @@
       <keyword name="SafeBrowsingManager (Module)" id="SafeBrowsingManager (Module)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html" />
       <keyword name="SafeBrowsingManager.__lookupHashes" id="SafeBrowsingManager.__lookupHashes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__lookupHashes" />
       <keyword name="SafeBrowsingManager.__setAutoUpdateThreatLists" id="SafeBrowsingManager.__setAutoUpdateThreatLists" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__setAutoUpdateThreatLists" />
+      <keyword name="SafeBrowsingManager.__setLookupMethod" id="SafeBrowsingManager.__setLookupMethod" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__setLookupMethod" />
       <keyword name="SafeBrowsingManager.__setPlatforms" id="SafeBrowsingManager.__setPlatforms" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__setPlatforms" />
       <keyword name="SafeBrowsingManager.__showNotificationMessage" id="SafeBrowsingManager.__showNotificationMessage" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__showNotificationMessage" />
       <keyword name="SafeBrowsingManager.__syncFullHashes" id="SafeBrowsingManager.__syncFullHashes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__syncFullHashes" />
@@ -13829,6 +13832,7 @@
       <keyword name="SafeBrowsingManager.lookupUrl" id="SafeBrowsingManager.lookupUrl" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.lookupUrl" />
       <keyword name="SafeBrowsingManager.showSafeBrowsingDialog" id="SafeBrowsingManager.showSafeBrowsingDialog" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.showSafeBrowsingDialog" />
       <keyword name="SafeBrowsingManager.updateHashPrefixCache" id="SafeBrowsingManager.updateHashPrefixCache" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.updateHashPrefixCache" />
+      <keyword name="SafeBrowsingThreatList (Module)" id="SafeBrowsingThreatList (Module)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html" />
       <keyword name="SafeBrowsingUrl" id="SafeBrowsingUrl" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.html#SafeBrowsingUrl" />
       <keyword name="SafeBrowsingUrl (Constructor)" id="SafeBrowsingUrl (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.html#SafeBrowsingUrl.__init__" />
       <keyword name="SafeBrowsingUrl (Module)" id="SafeBrowsingUrl (Module)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.html" />
@@ -16152,11 +16156,11 @@
       <keyword name="ThreadExtension.updateThreadList" id="ThreadExtension.updateThreadList" ref="eric6.DebugClients.Python.ThreadExtension.html#ThreadExtension.updateThreadList" />
       <keyword name="ThreadWrapper" id="ThreadWrapper" ref="eric6.DebugClients.Python.ThreadExtension.html#ThreadWrapper" />
       <keyword name="ThreadWrapper (Constructor)" id="ThreadWrapper (Constructor)" ref="eric6.DebugClients.Python.ThreadExtension.html#ThreadWrapper.__init__" />
-      <keyword name="ThreatList" id="ThreatList" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList" />
-      <keyword name="ThreatList (Constructor)" id="ThreatList (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.__init__" />
-      <keyword name="ThreatList.__repr__" id="ThreatList.__repr__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.__repr__" />
-      <keyword name="ThreatList.asTuple" id="ThreatList.asTuple" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.asTuple" />
-      <keyword name="ThreatList.fromApiEntry" id="ThreatList.fromApiEntry" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html#ThreatList.fromApiEntry" />
+      <keyword name="ThreatList" id="ThreatList" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#ThreatList" />
+      <keyword name="ThreatList (Constructor)" id="ThreatList (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#ThreatList.__init__" />
+      <keyword name="ThreatList.__repr__" id="ThreatList.__repr__" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#ThreatList.__repr__" />
+      <keyword name="ThreatList.asTuple" id="ThreatList.asTuple" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#ThreatList.asTuple" />
+      <keyword name="ThreatList.fromApiEntry" id="ThreatList.fromApiEntry" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#ThreatList.fromApiEntry" />
       <keyword name="TimerWrapper" id="TimerWrapper" ref="eric6.DebugClients.Python.ThreadExtension.html#TimerWrapper" />
       <keyword name="TimerWrapper (Constructor)" id="TimerWrapper (Constructor)" ref="eric6.DebugClients.Python.ThreadExtension.html#TimerWrapper.__init__" />
       <keyword name="Token" id="Token" ref="eric6.DataViews.CodeMetrics.html#Token" />
@@ -20228,6 +20232,7 @@
       <file>eric6.WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget.html</file>
       <file>eric6.WebBrowser.SafeBrowsing.SafeBrowsingLabel.html</file>
       <file>eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html</file>
+      <file>eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html</file>
       <file>eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.html</file>
       <file>eric6.WebBrowser.SafeBrowsing.SafeBrowsingUtilities.html</file>
       <file>eric6.WebBrowser.SafeBrowsing.__init__.html</file>
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html	Tue Apr 10 19:43:45 2018 +0200
+++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html	Wed Apr 11 19:57:23 2018 +0200
@@ -102,6 +102,9 @@
 <td><a href="#SafeBrowsingAPIClient.getThreatsUpdate">getThreatsUpdate</a></td>
 <td>Public method to fetch hash prefix updates for the given threat list.</td>
 </tr><tr>
+<td><a href="#SafeBrowsingAPIClient.lookupUrl">lookupUrl</a></td>
+<td>Public method to send an URL to Google for checking.</td>
+</tr><tr>
 <td><a href="#SafeBrowsingAPIClient.setApiKey">setApiKey</a></td>
 <td>Public method to set the API key.</td>
 </tr>
@@ -354,6 +357,29 @@
 <dd>
 list of dict
 </dd>
+</dl><a NAME="SafeBrowsingAPIClient.lookupUrl" ID="SafeBrowsingAPIClient.lookupUrl"></a>
+<h4>SafeBrowsingAPIClient.lookupUrl</h4>
+<b>lookupUrl</b>(<i>url, platforms</i>)
+<p>
+        Public method to send an URL to Google for checking.
+</p><dl>
+<dt><i>url</i> (QUrl)</dt>
+<dd>
+URL to be checked
+</dd><dt><i>platforms</i> (list of str)</dt>
+<dd>
+list of platform types to check against
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+list of threat list info objects
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of ThreatList
+</dd>
 </dl><a NAME="SafeBrowsingAPIClient.setApiKey" ID="SafeBrowsingAPIClient.setApiKey"></a>
 <h4>SafeBrowsingAPIClient.setApiKey</h4>
 <b>setApiKey</b>(<i>apiKey</i>)
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html	Tue Apr 10 19:43:45 2018 +0200
+++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingCache.html	Wed Apr 11 19:57:23 2018 +0200
@@ -30,14 +30,8 @@
 <h3>Classes</h3>
 <table>
 <tr>
-<td><a href="#HashPrefixList">HashPrefixList</a></td>
-<td>Class implementing a container for threat list data.</td>
-</tr><tr>
 <td><a href="#SafeBrowsingCache">SafeBrowsingCache</a></td>
 <td>Class implementing a cache for Google Safe Browsing.</td>
-</tr><tr>
-<td><a href="#ThreatList">ThreatList</a></td>
-<td>Class implementing the threat list info.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -45,85 +39,6 @@
 <tr><td>None</td></tr>
 </table>
 <hr /><hr />
-<a NAME="HashPrefixList" ID="HashPrefixList"></a>
-<h2>HashPrefixList</h2>
-<p>
-    Class implementing a container for threat list data.
-</p>
-<h3>Derived from</h3>
-object
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#HashPrefixList.__init__">HashPrefixList</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#HashPrefixList.__iter__">__iter__</a></td>
-<td>Special method to iterate over the raw hashes.</td>
-</tr><tr>
-<td><a href="#HashPrefixList.__len__">__len__</a></td>
-<td>Special method to calculate the number of entries.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="HashPrefixList.__init__" ID="HashPrefixList.__init__"></a>
-<h4>HashPrefixList (Constructor)</h4>
-<b>HashPrefixList</b>(<i>prefixLength, rawHashes</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>prefixLength</i> (int)</dt>
-<dd>
-length of each hash prefix
-</dd><dt><i>rawHashes</i> (str)</dt>
-<dd>
-raw hash prefixes of given length concatenated and
-            sorted in lexicographical order
-</dd>
-</dl><a NAME="HashPrefixList.__iter__" ID="HashPrefixList.__iter__"></a>
-<h4>HashPrefixList.__iter__</h4>
-<b>__iter__</b>(<i></i>)
-<p>
-        Special method to iterate over the raw hashes.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-iterator object
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-iterator
-</dd>
-</dl><a NAME="HashPrefixList.__len__" ID="HashPrefixList.__len__"></a>
-<h4>HashPrefixList.__len__</h4>
-<b>__len__</b>(<i></i>)
-<p>
-        Special method to calculate the number of entries.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-length
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-int
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="SafeBrowsingCache" ID="SafeBrowsingCache"></a>
 <h2>SafeBrowsingCache</h2>
 <p>
@@ -460,110 +375,5 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="ThreatList" ID="ThreatList"></a>
-<h2>ThreatList</h2>
-<p>
-    Class implementing the threat list info.
-</p>
-<h3>Derived from</h3>
-object
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr>
-<td><a href="#ThreatList.fromApiEntry">fromApiEntry</a></td>
-<td>Class method to instantiate a threat list given a threat list entry dictionary.</td>
-</tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#ThreatList.__init__">ThreatList</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#ThreatList.__repr__">__repr__</a></td>
-<td>Special method to generate a printable representation.</td>
-</tr><tr>
-<td><a href="#ThreatList.asTuple">asTuple</a></td>
-<td>Public method to convert the object to a tuple.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="ThreatList.fromApiEntry" ID="ThreatList.fromApiEntry"></a>
-<h4>ThreatList.fromApiEntry (class method)</h4>
-<b>fromApiEntry</b>(<i>entry</i>)
-<p>
-        Class method to instantiate a threat list given a threat list entry
-        dictionary.
-</p><dl>
-<dt><i>entry</i> (dict)</dt>
-<dd>
-threat list entry dictionary
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-instantiated object
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-ThreatList
-</dd>
-</dl><a NAME="ThreatList.__init__" ID="ThreatList.__init__"></a>
-<h4>ThreatList (Constructor)</h4>
-<b>ThreatList</b>(<i>threatType, platformType, threatEntryType</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>threatType</i> (str)</dt>
-<dd>
-threat type
-</dd><dt><i>platformType</i> (str)</dt>
-<dd>
-platform type
-</dd><dt><i>threatEntryType</i> (str)</dt>
-<dd>
-threat entry type
-</dd>
-</dl><a NAME="ThreatList.__repr__" ID="ThreatList.__repr__"></a>
-<h4>ThreatList.__repr__</h4>
-<b>__repr__</b>(<i></i>)
-<p>
-        Special method to generate a printable representation.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-printable representation
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-str
-</dd>
-</dl><a NAME="ThreatList.asTuple" ID="ThreatList.asTuple"></a>
-<h4>ThreatList.asTuple</h4>
-<b>asTuple</b>(<i></i>)
-<p>
-        Public method to convert the object to a tuple.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-tuple containing the threat list info
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-tuple of (str, str, str)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html	Tue Apr 10 19:43:45 2018 +0200
+++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html	Wed Apr 11 19:57:23 2018 +0200
@@ -82,6 +82,9 @@
 <td><a href="#SafeBrowsingManager.__setAutoUpdateThreatLists">__setAutoUpdateThreatLists</a></td>
 <td>Private method to set auto update for the threat lists.</td>
 </tr><tr>
+<td><a href="#SafeBrowsingManager.__setLookupMethod">__setLookupMethod</a></td>
+<td>Private method to set the lookup method (Update API or Lookup API).</td>
+</tr><tr>
 <td><a href="#SafeBrowsingManager.__setPlatforms">__setPlatforms</a></td>
 <td>Private method to set the platforms to be checked against.</td>
 </tr><tr>
@@ -201,6 +204,11 @@
 <b>__setAutoUpdateThreatLists</b>(<i></i>)
 <p>
         Private method to set auto update for the threat lists.
+</p><a NAME="SafeBrowsingManager.__setLookupMethod" ID="SafeBrowsingManager.__setLookupMethod"></a>
+<h4>SafeBrowsingManager.__setLookupMethod</h4>
+<b>__setLookupMethod</b>(<i></i>)
+<p>
+        Private method to set the lookup method (Update API or Lookup API).
 </p><a NAME="SafeBrowsingManager.__setPlatforms" ID="SafeBrowsingManager.__setPlatforms"></a>
 <h4>SafeBrowsingManager.__setPlatforms</h4>
 <b>__setPlatforms</b>(<i></i>)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html	Wed Apr 11 19:57:23 2018 +0200
@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList</h1>
+<p>
+Module implementing the threat list info class.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#HashPrefixList">HashPrefixList</a></td>
+<td>Class implementing a container for threat list data.</td>
+</tr><tr>
+<td><a href="#ThreatList">ThreatList</a></td>
+<td>Class implementing the threat list info.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="HashPrefixList" ID="HashPrefixList"></a>
+<h2>HashPrefixList</h2>
+<p>
+    Class implementing a container for threat list data.
+</p>
+<h3>Derived from</h3>
+object
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#HashPrefixList.__init__">HashPrefixList</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#HashPrefixList.__iter__">__iter__</a></td>
+<td>Special method to iterate over the raw hashes.</td>
+</tr><tr>
+<td><a href="#HashPrefixList.__len__">__len__</a></td>
+<td>Special method to calculate the number of entries.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="HashPrefixList.__init__" ID="HashPrefixList.__init__"></a>
+<h4>HashPrefixList (Constructor)</h4>
+<b>HashPrefixList</b>(<i>prefixLength, rawHashes</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>prefixLength</i> (int)</dt>
+<dd>
+length of each hash prefix
+</dd><dt><i>rawHashes</i> (str)</dt>
+<dd>
+raw hash prefixes of given length concatenated and
+            sorted in lexicographical order
+</dd>
+</dl><a NAME="HashPrefixList.__iter__" ID="HashPrefixList.__iter__"></a>
+<h4>HashPrefixList.__iter__</h4>
+<b>__iter__</b>(<i></i>)
+<p>
+        Special method to iterate over the raw hashes.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+iterator object
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+iterator
+</dd>
+</dl><a NAME="HashPrefixList.__len__" ID="HashPrefixList.__len__"></a>
+<h4>HashPrefixList.__len__</h4>
+<b>__len__</b>(<i></i>)
+<p>
+        Special method to calculate the number of entries.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+length
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="ThreatList" ID="ThreatList"></a>
+<h2>ThreatList</h2>
+<p>
+    Class implementing the threat list info.
+</p>
+<h3>Derived from</h3>
+object
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr>
+<td><a href="#ThreatList.fromApiEntry">fromApiEntry</a></td>
+<td>Class method to instantiate a threat list given a threat list entry dictionary.</td>
+</tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#ThreatList.__init__">ThreatList</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#ThreatList.__repr__">__repr__</a></td>
+<td>Special method to generate a printable representation.</td>
+</tr><tr>
+<td><a href="#ThreatList.asTuple">asTuple</a></td>
+<td>Public method to convert the object to a tuple.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="ThreatList.fromApiEntry" ID="ThreatList.fromApiEntry"></a>
+<h4>ThreatList.fromApiEntry (class method)</h4>
+<b>fromApiEntry</b>(<i>entry</i>)
+<p>
+        Class method to instantiate a threat list given a threat list entry
+        dictionary.
+</p><dl>
+<dt><i>entry</i> (dict)</dt>
+<dd>
+threat list entry dictionary
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+instantiated object
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+ThreatList
+</dd>
+</dl><a NAME="ThreatList.__init__" ID="ThreatList.__init__"></a>
+<h4>ThreatList (Constructor)</h4>
+<b>ThreatList</b>(<i>threatType, platformType, threatEntryType</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>threatType</i> (str)</dt>
+<dd>
+threat type
+</dd><dt><i>platformType</i> (str)</dt>
+<dd>
+platform type
+</dd><dt><i>threatEntryType</i> (str)</dt>
+<dd>
+threat entry type
+</dd>
+</dl><a NAME="ThreatList.__repr__" ID="ThreatList.__repr__"></a>
+<h4>ThreatList.__repr__</h4>
+<b>__repr__</b>(<i></i>)
+<p>
+        Special method to generate a printable representation.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+printable representation
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="ThreatList.asTuple" ID="ThreatList.asTuple"></a>
+<h4>ThreatList.asTuple</h4>
+<b>asTuple</b>(<i></i>)
+<p>
+        Public method to convert the object to a tuple.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the threat list info
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (str, str, str)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/index-eric6.WebBrowser.SafeBrowsing.html	Tue Apr 10 19:43:45 2018 +0200
+++ b/Documentation/Source/index-eric6.WebBrowser.SafeBrowsing.html	Wed Apr 11 19:57:23 2018 +0200
@@ -46,6 +46,9 @@
 <td><a href="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html">SafeBrowsingManager</a></td>
 <td>Module implementing the interface for Google Safe Browsing.</td>
 </tr><tr>
+<td><a href="eric6.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html">SafeBrowsingThreatList</a></td>
+<td>Module implementing the threat list info class.</td>
+</tr><tr>
 <td><a href="eric6.WebBrowser.SafeBrowsing.SafeBrowsingUrl.html">SafeBrowsingUrl</a></td>
 <td>Module implementing an URL representation suitable for Google Safe Browsing.</td>
 </tr><tr>
--- a/WebBrowser/Download/DownloadManager.py	Tue Apr 10 19:43:45 2018 +0200
+++ b/WebBrowser/Download/DownloadManager.py	Wed Apr 11 19:57:23 2018 +0200
@@ -242,6 +242,7 @@
             SafeBrowsingManager
         if SafeBrowsingManager.isEnabled():
             threatLists = WebBrowserWindow.safeBrowsingManager().lookupUrl(url)
+            # TODO: handle threatLists being None (indicating a lookup error)
             if threatLists:
                 threatMessages = WebBrowserWindow.safeBrowsingManager()\
                     .getThreatMessages(threatLists)
--- a/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Tue Apr 10 19:43:45 2018 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Wed Apr 11 19:57:23 2018 +0200
@@ -22,6 +22,8 @@
 
 from WebBrowser.WebBrowserWindow import WebBrowserWindow
 
+from .SafeBrowsingThreatList import ThreatList
+
 
 class SafeBrowsingAPIClient(QObject):
     """
@@ -30,7 +32,7 @@
     @signal networkError(str) emitted to indicate a network error
     """
     ClientId = "eric6_API_client"
-    ClientVersion = "1.0.0"
+    ClientVersion = "2.0.0"
     
     GsbUrlTemplate = "https://safebrowsing.googleapis.com/v4/{0}?key={1}"
     
@@ -47,11 +49,20 @@
         @param parent reference to the parent object
         @type QObject
         """
+        super(SafeBrowsingAPIClient, self).__init__(parent)
+        
         self.__apiKey = apiKey
         self.__fairUse = fairUse
         
         self.__nextRequestNoSoonerThan = QDateTime()
         self.__failCount = 0
+        
+        self.__lookupApiCache = {}
+        # Temporary cache used by the lookup API (v4)
+        # key: URL as string
+        # value: dictionary with these entries:
+        #   "validUntil": (QDateTime)
+        #   "threatInfo": (ThreatList)
     
     def setApiKey(self, apiKey):
         """
@@ -262,7 +273,89 @@
     ## Methods below implement the 'Lookup API (v4)'
     #######################################################################
     
-    # TODO: implement the Lookup API (including temporary caching)
+    def lookupUrl(self, url, platforms):
+        """
+        Public method to send an URL to Google for checking.
+        
+        @param url URL to be checked
+        @type QUrl
+        @param platforms list of platform types to check against
+        @type list of str
+        @return list of threat list info objects
+        @rtype list of ThreatList
+        """
+        # sanitize the URL by removing user info and query data
+        url = url.adjusted(
+            QUrl.RemoveUserInfo | QUrl.RemoveQuery | QUrl.RemoveFragment
+        )
+        urlStr = url.toString()
+        if urlStr in self.__lookupApiCache:
+            if self.__lookupApiCache[urlStr]["validUntil"] > \
+               QDateTime.currentDateTime():
+                # cached entry is still valid
+                return self.__lookupApiCache[urlStr]["threatInfo"]
+            else:
+                del self.__lookupApiCache[urlStr]
+        
+        requestBody = {
+            "client": {
+                "clientId": self.ClientId,
+                "clientVersion": self.ClientVersion,
+            },
+            "threatInfo": {
+                "threatTypes": [
+                    "MALWARE", "SOCIAL_ENGINEERING", "UNWANTED_SOFTWARE",
+                    "POTENTIALLY_HARMFUL_APPLICATION",
+                ],
+                "platformTypes": platforms,
+                "threatEntryTypes": ["URL", "EXECUTABLE"],
+                "threatEntries": [
+                    {"url": urlStr},
+                ],
+            },
+        }
+        
+        data = QByteArray(json.dumps(requestBody).encode("utf-8"))
+        url = QUrl(self.GsbUrlTemplate.format("threatMatches:find",
+                                              self.__apiKey))
+        req = QNetworkRequest(url)
+        req.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
+        reply = WebBrowserWindow.networkManager().post(req, data)
+        
+        while reply.isRunning():
+            QCoreApplication.processEvents(QEventLoop.AllEvents, 200)
+            # max. 200 ms processing
+        
+        threats = []
+        if reply.error() != QNetworkReply.NoError:
+            self.networkError.emit(reply.errorString())
+        else:
+            res = json.loads(str(reply.readAll(), "utf-8"))
+            if res and "matches" in res:
+                cacheDuration = 0
+                for match in res["matches"]:
+                    threatInfo = ThreatList(
+                        match["threatType"],
+                        match["platformType"],
+                        match["threatEntryType"],
+                    )
+                    threats.append(threatInfo)
+                    if "cacheDuration" in match:
+                        cacheDurationSec = int(
+                            match["cacheDuration"].strip().rstrip("s")
+                            .split(".")[0])
+                        if cacheDurationSec > cacheDuration:
+                            cacheDuration = cacheDurationSec
+                if cacheDuration > 0 and bool(threats):
+                    validUntil = QDateTime.currentDateTime().addSecs(
+                        cacheDuration)
+                    self.__lookupApiCache[urlStr] = {
+                        "validUntil": validUntil,
+                        "threatInfo": threats
+                    }
+        
+        reply.deleteLater()
+        return threats
     
     #######################################################################
     ## Methods below implement global (class wide) functionality
--- a/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Tue Apr 10 19:43:45 2018 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Wed Apr 11 19:57:23 2018 +0200
@@ -53,6 +53,8 @@
             "SafeBrowsingFilterPlatform")
         self.__automaticUpdate = Preferences.getWebBrowser(
             "SafeBrowsingAutoUpdate")
+        self.__useLookupApi = Preferences.getWebBrowser(
+            "SafeBrowsingUseLookupApi")
         
         self.buttonBox.setFocus()
         
@@ -66,11 +68,9 @@
         self.gsbGroupBox.setChecked(self.__enabled)
         self.gsbApiKeyEdit.setText(self.__apiKey)
         self.gsbFilterPlatformCheckBox.setChecked(self.__filterPlatform)
-        # TODO: add text to label to indicate Update API only
         self.gsbAutoUpdateCheckBox.setChecked(self.__automaticUpdate)
-        # TODO: add checkbox to enable the Lookup API
+        self.gsbLookupCheckBox.setChecked(self.__useLookupApi)
         
-        # TODO: enable the cache buttons group box only on Update API
         self.__updateCacheButtons()
         
         super(SafeBrowsingDialog, self).show()
@@ -114,6 +114,7 @@
         self.__apiKey = self.gsbApiKeyEdit.text()
         self.__filterPlatform = self.gsbFilterPlatformCheckBox.isChecked()
         self.__automaticUpdate = self.gsbAutoUpdateCheckBox.isChecked()
+        self.__useLookupApi = self.gsbLookupCheckBox.isChecked()
         
         Preferences.setWebBrowser("SafeBrowsingEnabled", self.__enabled)
         Preferences.setWebBrowser("SafeBrowsingApiKey", self.__apiKey)
@@ -121,6 +122,8 @@
                                   self.__filterPlatform)
         Preferences.setWebBrowser("SafeBrowsingAutoUpdate",
                                   self.__automaticUpdate)
+        Preferences.setWebBrowser("SafeBrowsingUseLookupApi",
+                                  self.__useLookupApi)
         
         self.__manager.configurationChanged()
         
@@ -152,7 +155,9 @@
             (self.__apiKey != self.gsbApiKeyEdit.text()) or
             (self.__filterPlatform !=
                 self.gsbFilterPlatformCheckBox.isChecked()) or
-            (self.__automaticUpdate != self.gsbAutoUpdateCheckBox.isChecked())
+            (self.__automaticUpdate !=
+                self.gsbAutoUpdateCheckBox.isChecked()) or
+            (self.__useLookupApi != self.gsbLookupCheckBox.isChecked())
         )
     
     def __okToClose(self):
@@ -289,6 +294,7 @@
         urlStr = self.urlEdit.text()
         url = QUrl.fromUserInput(urlStr)
         threatLists = self.__manager.lookupUrl(url)
+        # TODO: handle threatLists being None (indicating a lookup error)
         
         if threatLists:
             threatMessages = self.__manager.getThreatMessages(threatLists)
--- a/WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui	Tue Apr 10 19:43:45 2018 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui	Wed Apr 11 19:57:23 2018 +0200
@@ -16,7 +16,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -78,25 +78,8 @@
      <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="0" colspan="2">
-       <widget class="QPushButton" name="gsbHelpButton">
-        <property name="toolTip">
-         <string>Press to get some help about obtaining the API key</string>
-        </property>
-        <property name="text">
-         <string>Google Safe Browsing API Help</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="gsbApiKeyEdit">
-        <property name="toolTip">
-         <string>Enter the Google Safe Browsing API key</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
        <widget class="QCheckBox" name="gsbFilterPlatformCheckBox">
         <property name="toolTip">
          <string>Select to check against the current platform only</string>
@@ -106,20 +89,48 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2">
+      <item>
        <widget class="QCheckBox" name="gsbAutoUpdateCheckBox">
         <property name="toolTip">
          <string>Select to update the threat lists automatically when fair use period has expired</string>
         </property>
         <property name="text">
-         <string>Update threat lists automatically</string>
+         <string>Update threat lists automatically (Update API only)</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="gsbLookupCheckBox">
+        <property name="text">
+         <string>Use 'Lookup API' (Note: each URL is sent to Google for checking)</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_14">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QLabel" name="label_14">
+          <property name="text">
+           <string>API Key:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="gsbApiKeyEdit">
+          <property name="toolTip">
+           <string>Enter the Google Safe Browsing API key</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QPushButton" name="gsbHelpButton">
+        <property name="toolTip">
+         <string>Press to get some help about obtaining the API key</string>
+        </property>
         <property name="text">
-         <string>API Key:</string>
+         <string>Google Safe Browsing API Help</string>
         </property>
        </widget>
       </item>
@@ -174,9 +185,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="manageCacheGroupBox">
      <property name="title">
-      <string>Manage Local Cache</string>
+      <string>Manage Local Cache (Update API only)</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
@@ -305,6 +316,7 @@
   <tabstop>gsbGroupBox</tabstop>
   <tabstop>gsbFilterPlatformCheckBox</tabstop>
   <tabstop>gsbAutoUpdateCheckBox</tabstop>
+  <tabstop>gsbLookupCheckBox</tabstop>
   <tabstop>gsbApiKeyEdit</tabstop>
   <tabstop>gsbHelpButton</tabstop>
   <tabstop>saveButton</tabstop>
@@ -315,5 +327,22 @@
   <tabstop>urlCheckButton</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>gsbLookupCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>manageCacheGroupBox</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>62</x>
+     <y>161</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>67</x>
+     <y>334</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
--- a/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Tue Apr 10 19:43:45 2018 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Wed Apr 11 19:57:23 2018 +0200
@@ -69,6 +69,7 @@
         
         self.__gsbDialog = None
         self.__setPlatforms()
+        self.__setLookupMethod()
         
         self.__updatingThreatLists = False
         self.__threatListsUpdateTimer = QTimer(self)
@@ -96,6 +97,7 @@
             bool(self.__apiKey))
         
         self.__setPlatforms()
+        self.__setLookupMethod()
         self.__setAutoUpdateThreatLists()
     
     def __setPlatforms(self):
@@ -113,6 +115,13 @@
                 platform = "linux"
             self.__platforms = SafeBrowsingAPIClient.getPlatformTypes(platform)
     
+    def __setLookupMethod(self):
+        """
+        Private method to set the lookup method (Update API or Lookup API).
+        """
+        self.__useLookupApi = Preferences.getWebBrowser(
+            "SafeBrowsingUseLookupApi")
+    
     @classmethod
     def isEnabled(cls):
         """
@@ -170,7 +179,9 @@
         """
         Private method to set auto update for the threat lists.
         """
-        autoUpdateEnabled = Preferences.getWebBrowser("SafeBrowsingAutoUpdate")
+        autoUpdateEnabled = \
+            Preferences.getWebBrowser("SafeBrowsingAutoUpdate") and \
+            not Preferences.getWebBrowser("SafeBrowsingUseLookupApi")
         if autoUpdateEnabled and self.isEnabled():
             nextUpdateDateTime = Preferences.getWebBrowser(
                 "SafeBrowsingUpdateDateTime")
@@ -372,20 +383,31 @@
         @rtype list of ThreatList
         @exception ValueError raised for an invalid URL
         """
+        # TODO: extend to return error string in case of issues
         if self.isEnabled():
-            # TODO: add branch for the lookup API
-            if isinstance(url, QUrl):
-                urlStr = url.toString().strip()
+            if self.__useLookupApi:
+                if isinstance(url, str):
+                    url = QUrl(url.strip())
+                
+                if url.isEmpty():
+                    raise ValueError("Empty URL given.")
+                
+                listNames = self.__apiClient.lookupUrl(url, self.__platforms)
+                if listNames:
+                    return listNames
             else:
-                urlStr = url.strip()
-            
-            if not urlStr:
-                raise ValueError("Empty URL given.")
-            
-            urlHashes = SafeBrowsingUrl(urlStr).hashes()
-            listNames = self.__lookupHashes(urlHashes)
-            if listNames:
-                return listNames
+                if isinstance(url, QUrl):
+                    urlStr = url.toString().strip()
+                else:
+                    urlStr = url.strip()
+                
+                if not urlStr:
+                    raise ValueError("Empty URL given.")
+                
+                urlHashes = SafeBrowsingUrl(urlStr).hashes()
+                listNames = self.__lookupHashes(urlHashes)
+                if listNames:
+                    return listNames
         
         return None
     
--- a/WebBrowser/WebBrowserPage.py	Tue Apr 10 19:43:45 2018 +0200
+++ b/WebBrowser/WebBrowserPage.py	Wed Apr 11 19:57:23 2018 +0200
@@ -153,6 +153,7 @@
             if threatLists:
                 threatMessages = WebBrowserWindow.safeBrowsingManager()\
                     .getThreatMessages(threatLists)
+                # TODO: handle threatLists being None (indicating a lookup error)
                 res = E5MessageBox.warning(
                     WebBrowserWindow.getWindow(),
                     self.tr("Suspicuous URL detected"),
--- a/changelog	Tue Apr 10 19:43:45 2018 +0200
+++ b/changelog	Wed Apr 11 19:57:23 2018 +0200
@@ -6,6 +6,7 @@
   -- updated the translator URL for DeepL
 - Web Browser (NG)
   -- improvement of the download manager
+  -- added support for the Google Safe Browsing Lookup API (v4)
 - Third Party packages
   -- updated coverage.py to 4.5.1
   -- updated send2trash to version 1.5.0
--- a/i18n/eric6_cs.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_cs.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8696,32 +8696,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8730,7 +8730,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50597,27 +50597,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60650,87 +60650,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60738,7 +60738,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60753,132 +60753,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished">URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60888,45 +60883,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -60939,52 +60944,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -83323,12 +83328,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_de.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8339,32 +8339,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation>Fragwürdige URL entdeckt</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;Die URL &lt;b&gt;{0}&lt;/b&gt; wurde in der Safe Browsing Datenbank gefunden.&lt;/p&gt;{1}</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation>Downloads</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation>Downloads erledigt</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation>Alle Dateien wurden heruntergeladen.</translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation>
             <numerusform>{0}% von einer Datei ({1}) {2}</numerusform>
@@ -8372,7 +8372,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation>{0}% - Downloads</translation>
     </message>
@@ -49593,27 +49593,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
@@ -59583,87 +59583,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Warnung vor Schadsoftware&lt;/h3&gt;&lt;p&gt;Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, Schadsoftware zum Diebstahl oder zur Zerstörung ihrer Daten auf ihrem Computer zu installieren.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Phishing Warnung&lt;/h3&gt;&lt;p&gt;Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, sie zu veranlassen, gefährliche Onlineaktivitäten wie z.B. Eingabe von Kennwörtern oder persönlicher Informationen durchzuführen. Dies geschieht meist durch eine gefälschte Website.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Warnung vor unerwünschter Software&lt;/h3&gt;&lt;p&gt;Die Software, die sie herunterladen möchten, könnte möglicherweise ihre Surf- oder Computererfahrung negativ beeinträchtigen.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Potentiell gefährliche Anwendung&lt;/h3&gt;&lt;p&gt;Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, sie zur Installation einer Anwendung, die ihre Surf- und Computererfahrung negativ beeinflussen könnte, zu verleiten.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Warnung vor unbekannter Gefahr&lt;/h3&gt;Die Website, die sie besuchen wollen, wurde in der Safe Browsing Datenbank gefunden, ist jedoch bisher noch nicht klassifiziert.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation>Schadsoftware</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation>Phishing</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation>Unerwünschte Software</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation>Gefährliche Anwendung</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation>Bösartiges Binary</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation>Unbekannte Gefahr</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation>einige der definierten Plattformen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation>ale definierten Plattformen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation>unbekannte Plattform</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation>ausführbares Programm</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Warnung vor unerwünschter Software&lt;/h3&gt;&lt;p&gt;Die Software, die sie herunterladen möchten, könnte möglicherweise ihre Surf- oder Computererfahrung negativ beeinträchtigen.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Potentiell gefährliche Anwendung&lt;/h3&gt;&lt;p&gt;Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, sie zur Installation einer Anwendung, die ihre Surf- und Computererfahrung negativ beeinflussen könnte, zu verleiten.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Warnung vor unbekannter Gefahr&lt;/h3&gt;Die Website, die sie besuchen wollen, wurde in der Safe Browsing Datenbank gefunden, ist jedoch bisher noch nicht klassifiziert.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation>Schadsoftware</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation>Phishing</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation>Unerwünschte Software</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation>Gefährliche Anwendung</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation>Bösartiges Binary</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation>Unbekannte Gefahr</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation>einige der definierten Plattformen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation>ale definierten Plattformen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation>unbekannte Plattform</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation>ausführbares Programm</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation>unbekannter Typ</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Warnung vor bösartigem Binary&lt;/h3&gt;&lt;p&gt;Die Software, die sie herunterladen möchten, könnte möglicherweise für ihren Computer gefährlich sein.&lt;/p&gt;</translation>
     </message>
@@ -59671,7 +59671,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation>Safe Browsing Verwaltung</translation>
     </message>
@@ -59686,132 +59686,127 @@
         <translation>Google Safe Browsing aktivieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation>Auswählen, um nur gegen die aktuelle Plattform zu prüfen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation>API Schlüssel:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation>Gib den Google Safe Browsing Schlüssel ein</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation>Drücken, um Hilfe zur Erlangung des API Schlüssels zu erhalten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation>Google Safe Browsing API Hilfe</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation>Drücken, um die aktuelle Konfiguration zu speichern</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation>Konfiguration speichern</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation>Lokalen Zwischenspeicher verwalten</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation>Drücken, um die lokale Datenbank zu aktualisieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation>Zwischenspeicher aktualisieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation>Drücken, um den Zwischenspeicher zu löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation>Zwischenspeicher löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation>%v/%m</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation>URL Prüfung</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation>Drücken, um die eingegebene URL zu prüfen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation>URL prüfen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation>Der Dialog enthält ungesicherte Änderungen.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation>Safe Browsing Zwischenspeicher aktualisieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation>Die Aktualisierung des Safe Browsing Zwischenspeichers kann eine längerdauernde Aktion sein. Bitte haben sie Geduld!</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Aktualisierung des Safe Browsing Zwischenspeichers ist fehlgeschlagen.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Aktualisierung des Safe Browsing Zwischenspeichers ist fehlgeschlagen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation>Safe Browsing Zwischenspeicher löschen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation>Soll der Safe Browsing Zwischenspeicher wirklich gelöscht werden? Der Neuaufbau kann eine längere Zeit beanspruchen.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;Die URL &lt;b&gt;{0}&lt;/b&gt; wurde in der Safe Browsing Datenbank gefunden.&lt;/p&gt;{1}</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die URL &lt;b&gt;{0}&lt;/b&gt; wurde nicht in der Safe Browsing Datenbank gefunden und kann als sicher betrachtet werden.&lt;/p&gt;</translation>
     </message>
@@ -59821,45 +59816,55 @@
         <translation>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation>nur gegen Bedrohungslisten der aktuelle Plattform prüfen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation>Auswählen, um die Bedrohungslisten automatisch zu aktualisieren sobald die &apos;Fair Use&apos; Zeit abgelaufen ist</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation>Bedrohungslisten automatich aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation>Drücken, um zu sehen, wann die nächste Aktualisierung der Bedrohungslisten durchgeführt wird</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation>Zeige Aktualisierungszeit</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation>Die nächste Aktualisierung der Bedrohungslisten wird in Kürze ausgeführt.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die nächste Aktualisierung der Bedrohungslisten wird um &lt;b&gt;{0}&lt;/b&gt; ausgeführt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation>Aktualisierungszeit</translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation>Bedrohungslisten automatich aktualisieren (nur für Update API)</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation>&apos;Lookup API&apos; verwenden (Hinweis: jede URL wird zur Prüfung an Google geschickt)</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation>Lokalen Zwischenspeicher verwalten (nur für Update API)</translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -59872,52 +59877,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation>Safe Browsing ist deaktiviert.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation>Die &apos;Fair Use&apos; Wartezeit ist noch nicht abgelaufen. Ablaufzeitpunkt ist {0}.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation>Aktualisiere Bedrohungslisten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation>Lösche überholte Bedrohungslisten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation>Aktualisiere Hashpräfixe</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation>Die Prüsumme des lokalen Zwischenspeichers entspricht nicht der des Servers. Ein löschen des Zwischenspeichers könnte das Problem beheben. Aktualisierung der Bedrohungslisten wurde abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation>Aktualisiere Bedrohungslisten...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation>Aktualisierung der Bedrohungslisten abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation>Aktualisierung der Bedrohungslisten fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation>Google Safe Browsing</translation>
     </message>
@@ -81990,12 +81995,12 @@
         <translation> s</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation>Fragwürdige URL entdeckt</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;Die URL &lt;b&gt;{0}&lt;/b&gt; wurde in der Safe Browsing Datenbank gefunden.&lt;/p&gt;{1}</translation>
     </message>
--- a/i18n/eric6_empty.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_empty.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8250,39 +8250,39 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49342,27 +49342,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59135,87 +59135,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59223,7 +59223,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59238,132 +59238,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59373,45 +59368,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -59424,52 +59429,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81320,12 +81325,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_en.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8262,32 +8262,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation>
             <numerusform>{0}% of one file ({1}) {2}</numerusform>
@@ -8295,7 +8295,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49389,27 +49389,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59184,87 +59184,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59272,7 +59272,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59287,132 +59287,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59422,45 +59417,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -59473,52 +59478,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81370,12 +81375,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_es.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8334,32 +8334,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation>Detectada URL sospechosa</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;La URL &lt;b&gt;{0}&lt;/b&gt; se ha encontrado en la base de datos de Navegación Segura.&lt;/p&gt;{1}</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8367,7 +8367,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49594,27 +49594,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -59563,87 +59563,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Advertencia de Malware&lt;/h3&gt;&lt;p&gt;Este sitio web podría tratar de instalar programas dañinos en su ordenador con la finalidad de robar o destruir datos.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Advertencia de Phishing&lt;/h3&gt;&lt;p&gt;Este sitio web podría tratar de engañarle para hacer algo peligroso online, tal como revelar contraseñas o información personal, usualmente a través de un sitio web falsificado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Advertencia de Software no Deseado&lt;/h3&gt;&lt;p&gt;El software que se va a descargar podría afectar negativamente a la experiencia de navegación o de uso del ordenador.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Aplicación Potencialmente Dañina&lt;/h3&gt;&lt;p&gt;Este sitio web podría tratar de engañarle para instalar aplicaciones que podrían afectar negativamente su experiencia de navegación.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Advertencia de Amenaza Desconocida&lt;/h3&gt;&lt;p&gt;Este sitio web se ha encontrado en la Base de Datos de Navegación Segura aunque no está todavía clasificado.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation>Malware</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation>Phishing</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation>Software No Deseado</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation>Aplicación Dañina</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation>Binario Malicioso</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation>Amenaza Desconocida</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation>cualquier plataforma definida</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation>todas las plataformas definidas</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation>plataforma desconocida</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation>programa ejecutable</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Advertencia de Software no Deseado&lt;/h3&gt;&lt;p&gt;El software que se va a descargar podría afectar negativamente a la experiencia de navegación o de uso del ordenador.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Aplicación Potencialmente Dañina&lt;/h3&gt;&lt;p&gt;Este sitio web podría tratar de engañarle para instalar aplicaciones que podrían afectar negativamente su experiencia de navegación.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Advertencia de Amenaza Desconocida&lt;/h3&gt;&lt;p&gt;Este sitio web se ha encontrado en la Base de Datos de Navegación Segura aunque no está todavía clasificado.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation>Malware</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation>Phishing</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation>Software No Deseado</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation>Aplicación Dañina</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation>Binario Malicioso</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation>Amenaza Desconocida</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation>cualquier plataforma definida</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation>todas las plataformas definidas</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation>plataforma desconocida</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation>programa ejecutable</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation>tipo desconocido</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Advertencia de Software Malicioso&lt;/h3&gt;&lt;p&gt;El software que se va a descargar podría ser dañino para su ordenador.&lt;/p&gt;</translation>
     </message>
@@ -59651,7 +59651,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation>Gestión de Navegación Segura</translation>
     </message>
@@ -59666,132 +59666,132 @@
         <translation>Habilitar Navegación Segura de Google</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation>Seleccionar para comprobar solamente para la plataforma actual</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation>API Key:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation>Introducir la API key de Google Navegación Segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation>Pulsar para ayuda sobre como obtener la API key</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation>Ayuda para la API de Navegación Segura de Google</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation>Pulsar para guardar los ajustes de configuración actuales</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation>Guardar Configuración</translation>
     </message>
     <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
         <source>Manage Local Cache</source>
-        <translation>Gestionar Caché Local</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <translation type="obsolete">Gestionar Caché Local</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation>Pulsar para actualizar la base de datos en caché local</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation>Actualizar Caché</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation>Pulsar para limpiar la base de datos en caché local</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation>Limpiar Caché</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation>%v/%m</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation>Comprobación de URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation>Pulsar para comprobar la URL introducida</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation>Comprobar URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation>El diálogo contiene cambios sin guardar.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation>Actualizar Caché de Navegación Segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation>Actualizar la caché de Navegación Segura puede ser una operación larga. Por favor, ¡sea paciente!</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;La actualización de la caché de Navegación Segura ha fallado.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La actualización de la caché de Navegación Segura ha fallado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation>Limpiear Caché de Navegación Segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation>¿Realmente desea limpiear la caché de Navegación Segura? Su regeneración podría llevar algún tiempo.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;La URL &lt;b&gt;{0}&lt;/b&gt; se ha encontrado en la base de datos de Navegación Segura.&lt;/p&gt;{1}</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La URL &lt;b&gt;{0}&lt;/b&gt; no se ha encontrado en la base de datos de Navegación Segura y se puede considerar segura.&lt;/p&gt;</translation>
     </message>
@@ -59801,45 +59801,60 @@
         <translation>&lt;h2&gt;Navegación Segura de Google&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation>Ajustar listas de amenazas a plataforma actual</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation>Seleccionar para actualizar las listas de amenazas automaticamente cuando el periodo de uso justo ha expirado</translation>
     </message>
     <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
         <source>Update threat lists automatically</source>
-        <translation>Actualizar listas de amenazas automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <translation type="obsolete">Actualizar listas de amenazas automaticamente</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation>Pulsar para ver cuando se actualizará la siguiente vez la lista de amenazas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation>Mostrar Momento de Actualización</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation>La siguiente actualización automática de lista de amenazas se hará ahora.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La siguiente actualización automática de lista de amenazas se hará en &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation>Momento de Actualización</translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -59852,52 +59867,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation>La Navegación Segura está deshabilitada.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation>El periodo de uso justo no ha expirado todavía. Expirará el {0}.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation>Actualizando listas de amenazas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation>Borrando listas obsoletas de amenazas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation>Acutalizando prefijos de hash</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation>La checksum de la caché local no coincide con el servidor. Considere limpiar la caché. La actualización de amenazas se ha abortado.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation>Actualizando listas de amenazas...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation>Actualización de listas de amenazas terminada</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation>La actualización de listas de amenazas ha fallado</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation>Navegación Segura de Google</translation>
     </message>
@@ -81960,12 +81975,12 @@
         <translation> s</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation>Detectada URL sospechosa</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;La URL &lt;b&gt;{0}&lt;/b&gt; se ha encontrado en la base de datos de Navegación Segura.&lt;/p&gt;{1}</translation>
     </message>
--- a/i18n/eric6_fr.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_fr.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8642,32 +8642,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8675,7 +8675,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50330,27 +50330,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60373,87 +60373,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60461,7 +60461,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60476,132 +60476,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished">URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60611,45 +60606,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -60662,52 +60667,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -83069,12 +83074,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_it.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8353,32 +8353,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8386,7 +8386,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49567,27 +49567,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59520,87 +59520,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59608,7 +59608,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59623,132 +59623,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished">URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59758,45 +59753,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -59809,52 +59814,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -81850,12 +81855,12 @@
         <translation type="unfinished"> s</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_pt.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8795,32 +8795,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8828,7 +8828,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51026,27 +51026,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -60920,87 +60920,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61008,7 +61008,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61023,132 +61023,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished">URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61158,45 +61153,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -61209,52 +61214,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -83500,12 +83505,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_ru.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_ru.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8368,32 +8368,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation>Обнаружен подозрительный URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;URL &lt;b&gt;{0}&lt;/b&gt; был найден в базе Safe Browsing.&lt;/p&gt;{1}</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8402,7 +8402,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49684,27 +49684,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
@@ -59743,87 +59743,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Предупреждение о вредоносном ПО&lt;/h3&gt;&lt;p&gt;Веб-сайт, который Вы собираетесь посетить, может попытаться установить на вашем компьютере опасные программы, чтобы украсть или уничтожить Ваши данные.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Предупреждение о фишинг-контенте&lt;/h3&gt;&lt;p&gt;Веб-сайт, который Вы собираетесь посетить, может попытаться обмануть Вас, обычно через поддельный веб-сайт, например раскрыть пароли или личную информацию.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Предупреждение о нежелательном ПО&lt;/h3&gt;&lt;p&gt;Программное обеспечение, которое вы собираетесь загрузить, может негативно повлиять на работу в браузере или на компьютере..&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Потенциально опасное приложение&lt;/h3&gt;&lt;p&gt;Веб-сайт, который вы собираетесь посетить, может попытаться обмануть вас при установке приложений, что может негативно повлиять на ваш просмотр.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation>&lt;h3&gt;Предупреждение о неизвестной угрозе&lt;/h3&gt;&lt;p&gt;Веб-сайт, который вы собираетесь посетить, был найден в базе Safe Browsing, но не был классифицирован.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation>Вредоносное ПО</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation>Фишинг</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation>Нежелательное ПО</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation>Опасное приложение</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation>Вредный двоичный файл</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation>Неизвестная угроза</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation>любая определенная платформа</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation>все определенные платформы</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation>неизвестная платформа</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation>исполняемая программа</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Предупреждение о нежелательном ПО&lt;/h3&gt;&lt;p&gt;Программное обеспечение, которое вы собираетесь загрузить, может негативно повлиять на работу в браузере или на компьютере..&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Потенциально опасное приложение&lt;/h3&gt;&lt;p&gt;Веб-сайт, который вы собираетесь посетить, может попытаться обмануть вас при установке приложений, что может негативно повлиять на ваш просмотр.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation>&lt;h3&gt;Предупреждение о неизвестной угрозе&lt;/h3&gt;&lt;p&gt;Веб-сайт, который вы собираетесь посетить, был найден в базе Safe Browsing, но не был классифицирован.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation>Вредоносное ПО</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation>Фишинг</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation>Нежелательное ПО</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation>Опасное приложение</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation>Вредный двоичный файл</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation>Неизвестная угроза</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation>любая определенная платформа</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation>все определенные платформы</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation>неизвестная платформа</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation>исполняемая программа</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation>неизвестный тип</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation>&lt;h3&gt;Предупреждение о вредном двоичном файле&lt;/h3&gt;&lt;p&gt;Программное обеспечение, которое Вы собираетесь загрузить, может нанести вред вашему компьютеру.&lt;/p&gt;</translation>
     </message>
@@ -59831,7 +59831,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation>Управление Safe Browsing</translation>
     </message>
@@ -59846,132 +59846,132 @@
         <translation>Служба Google Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation>Разрешить проверку только для текущей платформы</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation>API ключ:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation>Введите API ключ Safe Browsing Google</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation>Справка о получении API ключа</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation>Справка Google Safe Browsing API</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation>Сохранить текущие параметры конфигурации</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation>Сохранить конфигурацию</translation>
     </message>
     <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
         <source>Manage Local Cache</source>
-        <translation>Управление локальным кэшем</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <translation type="obsolete">Управление локальным кэшем</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation>Обновить базу данных локального кэша</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation>Обновить кэш</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation>Очистить базу данных локального кэша</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation>Очистить кэш</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation>%v/%m</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation>Проверка URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation>Проверить введенный URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation>Проверить URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation>Диалог содержит несохраненные изменения.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation>Обновить кэш Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation>Обновление кэша  Safe Browsing может занять некоторое время. Пожалуйста, подождите!</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удалось обновить кэш  Safe Browsing.&lt;/p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Не удалось обновить кэш Safe Browsing.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation>Очистить кэш Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation>Вы действительно хотите очистить кэш Safe Browsing? Повторное его заполнение может занять некоторое время.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;URL &lt;b&gt;{0}&lt;/b&gt; был найден в базе  Safe Browsing.&lt;/p&gt;{1}</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation>&lt;p&gt;URL &lt;b&gt;{0}&lt;/b&gt; не найден в базе Safe Browsing и может считаться безопасным.&lt;/p&gt;</translation>
     </message>
@@ -59981,45 +59981,60 @@
         <translation>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation>Уточнять списки угроз текущей платформы</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation>Разрешить автоматическое обновление списков угроз по завершении срока честного использования</translation>
     </message>
     <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
         <source>Update threat lists automatically</source>
-        <translation>Автоматически обновлять списки угроз</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <translation type="obsolete">Автоматически обновлять списки угроз</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation>Срок следующего обновления списка угроз</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation>Показать время обновления</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation>Сейчас будет выполнено очередное автоматическое обновление списка угроз.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Следующее автоматическое обновление списка угроз будет выполнено &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation>Время обновления</translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -60032,52 +60047,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation>Сервис Safe Browsing отключен.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation>Не завершен период ожидания для &quot;честного&quot; использования сайта. Завершение периода наступит {0}.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation>Обновление списков угроз</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation>Удаление устаревших списков угроз</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation>Обновление хеш-префиксов</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation>Контрольная сумма локального кэша не соответствует серверу. Подумайте об очистке кэша. Обновление списка угроз было прервано.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation>Обновление списков угроз...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation>Обновление списка угроз выполнено</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation>Сбой обновления списка угроз</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation>Google Safe Browsing</translation>
     </message>
@@ -82216,12 +82231,12 @@
         <translation> сек</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation>Обнаружен подозрительный URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;URL &lt;b&gt;{0}&lt;/b&gt; был найден в базе Safe Browsing.&lt;/p&gt;{1}</translation>
     </message>
--- a/i18n/eric6_tr.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_tr.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8674,32 +8674,32 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -8707,7 +8707,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50420,27 +50420,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60313,87 +60313,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60401,7 +60401,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60416,132 +60416,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished">URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60551,45 +60546,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -60602,52 +60607,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82924,12 +82929,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Tue Apr 10 19:43:45 2018 +0200
+++ b/i18n/eric6_zh_CN.ts	Wed Apr 11 19:57:23 2018 +0200
@@ -8681,39 +8681,39 @@
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="249"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="250"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="571"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="572"/>
         <source>Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>Downloads finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="483"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="484"/>
         <source>All files have been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="603"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="604"/>
         <source>{0}% of %n file(s) ({1}) {2}</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="610"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="611"/>
         <source>{0}% - Download Manager</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50410,27 +50410,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1657"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1684"/>
+        <location filename="../Preferences/__init__.py" line="1685"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select Python{0} Interpreter</source>
         <translation>选择 Python{0} 解释器</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1786"/>
+        <location filename="../Preferences/__init__.py" line="1787"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>选择要使用的 Python{0} 解释器:</translation>
     </message>
@@ -60461,87 +60461,87 @@
 <context>
     <name>SafeBrowsingAPI</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/>
         <source>&lt;h3&gt;Malware Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="276"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/>
         <source>&lt;h3&gt;Phishing Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="284"/>
-        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="290"/>
-        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="304"/>
-        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="324"/>
-        <source>Malware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="327"/>
-        <source>Phishing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="330"/>
-        <source>Unwanted Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="333"/>
-        <source>Harmful Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="336"/>
-        <source>Malicious Binary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="339"/>
-        <source>Unknown Threat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="366"/>
-        <source>any defined platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="369"/>
-        <source>all defined platforms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="372"/>
-        <source>unknown platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="388"/>
-        <source>executable program</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/>
+        <source>&lt;h3&gt;Unwanted Software Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may negatively affect your browsing or computing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/>
+        <source>&lt;h3&gt;Potentially Harmful Application&lt;/h3&gt;&lt;p&gt;The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/>
+        <source>&lt;h3&gt;Unknown Threat Warning&lt;/h3&gt;&lt;p&gt;The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/>
+        <source>Malware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/>
+        <source>Phishing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/>
+        <source>Unwanted Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/>
+        <source>Harmful Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/>
+        <source>Malicious Binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/>
+        <source>Unknown Threat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/>
+        <source>any defined platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/>
+        <source>all defined platforms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/>
+        <source>unknown platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/>
+        <source>executable program</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/>
         <source>unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="297"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/>
         <source>&lt;h3&gt;Malicious Binary Warning&lt;/h3&gt;&lt;p&gt;The software you are about to download may be harmful to your computer.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60549,7 +60549,7 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60564,132 +60564,127 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="114"/>
         <source>API Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="121"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="130"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="89"/>
         <source>Google Safe Browsing API Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="158"/>
         <source>Press to save the current configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="161"/>
         <source>Save Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="198"/>
         <source>Press to update the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="201"/>
         <source>Update Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="208"/>
         <source>Press to clear the local cache database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="211"/>
         <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="250"/>
         <source>%v/%m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="267"/>
         <source>URL Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="273"/>
         <source>URL:</source>
         <translation type="unfinished">URL:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="286"/>
         <source>Press to check the entered URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>Check URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="172"/>
         <source>The dialog contains unsaved changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>Update Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
         <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="209"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="215"/>
         <source>&lt;p&gt;Updating the Safe Browsing cache failed.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Clear Safe Browsing Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="226"/>
         <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing Database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was not found in the Safe Browsing Database and may be considered safe.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60699,45 +60694,55 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="88"/>
         <source>Adjust threat lists to current platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Select to update the threat lists automatically when fair use period has expired</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/>
-        <source>Update threat lists automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="225"/>
         <source>Press to see, when the next threat list update will be done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="228"/>
         <source>Show Update Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/>
         <source>The next automatic threat list update will be done now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/>
         <source>&lt;p&gt;The next automatic threat list update will be done at &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="331"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/>
         <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="98"/>
+        <source>Update threat lists automatically (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Use &apos;Lookup API&apos; (Note: each URL is sent to Google for checking)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Manage Local Cache (Update API only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -60750,52 +60755,52 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="230"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="242"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="234"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="246"/>
         <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="255"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="269"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="288"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="314"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/>
         <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="199"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <source>Updating threat lists...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="203"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="215"/>
         <source>Updating threat lists done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="206"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="218"/>
         <source>Updating threat lists failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="157"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="167"/>
         <source>Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
@@ -83167,12 +83172,12 @@
         <translation type="unfinished"> 秒</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>Suspicuous URL detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="156"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="157"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation type="unfinished"></translation>
     </message>

eric ide

mercurial