eric: changeset 5839:fe4d62e23908

--- a/APIs/Python3/eric6.api	Tue Aug 08 10:53:10 2017 +0200
+++ b/APIs/Python3/eric6.api	Tue Aug 08 17:20:28 2017 +0200
@@ -10645,6 +10645,7 @@
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_clearCacheButton_clicked?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_gsbHelpButton_clicked?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_saveButton_clicked?4()
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_showUpdateTimeButton_clicked?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_updateCacheButton_clicked?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_urlCheckButton_clicked?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.SafeBrowsingDialog.on_urlEdit_textChanged?4(text)
@@ -10671,6 +10672,7 @@
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.getThreatMessages?4(threatLists)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.getThreatType?4(threatList)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.isEnabled?4()
+eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.isUpdatingThreatLists?4()
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.lookupUrl?4(url)
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.progress?7
 eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.SafeBrowsingManager.progressMessage?7
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Tue Aug 08 10:53:10 2017 +0200
+++ b/Documentation/Help/source.qhp	Tue Aug 08 17:20:28 2017 +0200
@@ -12367,6 +12367,7 @@
       <keyword name="SafeBrowsingDialog.on_clearCacheButton_clicked" id="SafeBrowsingDialog.on_clearCacheButton_clicked" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_clearCacheButton_clicked" />
       <keyword name="SafeBrowsingDialog.on_gsbHelpButton_clicked" id="SafeBrowsingDialog.on_gsbHelpButton_clicked" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_gsbHelpButton_clicked" />
       <keyword name="SafeBrowsingDialog.on_saveButton_clicked" id="SafeBrowsingDialog.on_saveButton_clicked" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_saveButton_clicked" />
+      <keyword name="SafeBrowsingDialog.on_showUpdateTimeButton_clicked" id="SafeBrowsingDialog.on_showUpdateTimeButton_clicked" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_showUpdateTimeButton_clicked" />
       <keyword name="SafeBrowsingDialog.on_updateCacheButton_clicked" id="SafeBrowsingDialog.on_updateCacheButton_clicked" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_updateCacheButton_clicked" />
       <keyword name="SafeBrowsingDialog.on_urlCheckButton_clicked" id="SafeBrowsingDialog.on_urlCheckButton_clicked" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_urlCheckButton_clicked" />
       <keyword name="SafeBrowsingDialog.on_urlEdit_textChanged" id="SafeBrowsingDialog.on_urlEdit_textChanged" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html#SafeBrowsingDialog.on_urlEdit_textChanged" />
@@ -12388,8 +12389,11 @@
       <keyword name="SafeBrowsingManager (Constructor)" id="SafeBrowsingManager (Constructor)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__init__" />
       <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.__setPlatforms" id="SafeBrowsingManager.__setPlatforms" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__setPlatforms" />
+      <keyword name="SafeBrowsingManager.__showStatusBarMessage" id="SafeBrowsingManager.__showStatusBarMessage" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__showStatusBarMessage" />
       <keyword name="SafeBrowsingManager.__syncFullHashes" id="SafeBrowsingManager.__syncFullHashes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__syncFullHashes" />
+      <keyword name="SafeBrowsingManager.__threatListsUpdateTimerTimeout" id="SafeBrowsingManager.__threatListsUpdateTimerTimeout" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__threatListsUpdateTimerTimeout" />
       <keyword name="SafeBrowsingManager.__verifyThreatListChecksum" id="SafeBrowsingManager.__verifyThreatListChecksum" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.__verifyThreatListChecksum" />
       <keyword name="SafeBrowsingManager.close" id="SafeBrowsingManager.close" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.close" />
       <keyword name="SafeBrowsingManager.configurationChanged" id="SafeBrowsingManager.configurationChanged" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.configurationChanged" />
@@ -12402,6 +12406,7 @@
       <keyword name="SafeBrowsingManager.getThreatMessages" id="SafeBrowsingManager.getThreatMessages" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.getThreatMessages" />
       <keyword name="SafeBrowsingManager.getThreatType" id="SafeBrowsingManager.getThreatType" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.getThreatType" />
       <keyword name="SafeBrowsingManager.isEnabled" id="SafeBrowsingManager.isEnabled" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.isEnabled" />
+      <keyword name="SafeBrowsingManager.isUpdatingThreatLists" id="SafeBrowsingManager.isUpdatingThreatLists" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html#SafeBrowsingManager.isUpdatingThreatLists" />
       <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" />
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html	Tue Aug 08 10:53:10 2017 +0200
+++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingDialog.html	Tue Aug 08 17:20:28 2017 +0200
@@ -96,6 +96,9 @@
 <td><a href="#SafeBrowsingDialog.on_saveButton_clicked">on_saveButton_clicked</a></td>
 <td>Private slot to save the configuration data.</td>
 </tr><tr>
+<td><a href="#SafeBrowsingDialog.on_showUpdateTimeButton_clicked">on_showUpdateTimeButton_clicked</a></td>
+<td>Private slot to show the time of the next automatic threat list update.</td>
+</tr><tr>
 <td><a href="#SafeBrowsingDialog.on_updateCacheButton_clicked">on_updateCacheButton_clicked</a></td>
 <td>Private slot to update the local cache database.</td>
 </tr><tr>
@@ -240,6 +243,11 @@
 <b>on_saveButton_clicked</b>(<i></i>)
 <p>
         Private slot to save the configuration data.
+</p><a NAME="SafeBrowsingDialog.on_showUpdateTimeButton_clicked" ID="SafeBrowsingDialog.on_showUpdateTimeButton_clicked"></a>
+<h4>SafeBrowsingDialog.on_showUpdateTimeButton_clicked</h4>
+<b>on_showUpdateTimeButton_clicked</b>(<i></i>)
+<p>
+        Private slot to show the time of the next automatic threat list update.
 </p><a NAME="SafeBrowsingDialog.on_updateCacheButton_clicked" ID="SafeBrowsingDialog.on_updateCacheButton_clicked"></a>
 <h4>SafeBrowsingDialog.on_updateCacheButton_clicked</h4>
 <b>on_updateCacheButton_clicked</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html	Tue Aug 08 10:53:10 2017 +0200
+++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html	Tue Aug 08 17:20:28 2017 +0200
@@ -76,12 +76,21 @@
 <td><a href="#SafeBrowsingManager.__lookupHashes">__lookupHashes</a></td>
 <td>Private method to lookup the given hashes.</td>
 </tr><tr>
+<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.__setPlatforms">__setPlatforms</a></td>
 <td>Private method to set the platforms to be checked against.</td>
 </tr><tr>
+<td><a href="#SafeBrowsingManager.__showStatusBarMessage">__showStatusBarMessage</a></td>
+<td>Private method to show some message in the main window status bar.</td>
+</tr><tr>
 <td><a href="#SafeBrowsingManager.__syncFullHashes">__syncFullHashes</a></td>
 <td>Private method to download full hashes matching given prefixes.</td>
 </tr><tr>
+<td><a href="#SafeBrowsingManager.__threatListsUpdateTimerTimeout">__threatListsUpdateTimerTimeout</a></td>
+<td>Private slot to perform the auto update of the threat lists.</td>
+</tr><tr>
 <td><a href="#SafeBrowsingManager.__verifyThreatListChecksum">__verifyThreatListChecksum</a></td>
 <td>Private method to verify the local checksum of a threat list with the checksum of the safe browsing server.</td>
 </tr><tr>
@@ -115,6 +124,9 @@
 <td><a href="#SafeBrowsingManager.isEnabled">isEnabled</a></td>
 <td>Public method to check, if safe browsing is enabled.</td>
 </tr><tr>
+<td><a href="#SafeBrowsingManager.isUpdatingThreatLists">isUpdatingThreatLists</a></td>
+<td>Public method to check, if we are in the process of updating the threat lists.</td>
+</tr><tr>
 <td><a href="#SafeBrowsingManager.lookupUrl">lookupUrl</a></td>
 <td>Public method to lookup an URL.</td>
 </tr><tr>
@@ -169,12 +181,27 @@
 <dd>
 list of ThreatList
 </dd>
-</dl><a NAME="SafeBrowsingManager.__setPlatforms" ID="SafeBrowsingManager.__setPlatforms"></a>
+</dl><a NAME="SafeBrowsingManager.__setAutoUpdateThreatLists" ID="SafeBrowsingManager.__setAutoUpdateThreatLists"></a>
+<h4>SafeBrowsingManager.__setAutoUpdateThreatLists</h4>
+<b>__setAutoUpdateThreatLists</b>(<i></i>)
+<p>
+        Private method to set auto update for the threat lists.
+</p><a NAME="SafeBrowsingManager.__setPlatforms" ID="SafeBrowsingManager.__setPlatforms"></a>
 <h4>SafeBrowsingManager.__setPlatforms</h4>
 <b>__setPlatforms</b>(<i></i>)
 <p>
         Private method to set the platforms to be checked against.
-</p><a NAME="SafeBrowsingManager.__syncFullHashes" ID="SafeBrowsingManager.__syncFullHashes"></a>
+</p><a NAME="SafeBrowsingManager.__showStatusBarMessage" ID="SafeBrowsingManager.__showStatusBarMessage"></a>
+<h4>SafeBrowsingManager.__showStatusBarMessage</h4>
+<b>__showStatusBarMessage</b>(<i>message</i>)
+<p>
+        Private method to show some message in the main window status bar.
+</p><dl>
+<dt><i>message</i> (str)</dt>
+<dd>
+message to be shown
+</dd>
+</dl><a NAME="SafeBrowsingManager.__syncFullHashes" ID="SafeBrowsingManager.__syncFullHashes"></a>
 <h4>SafeBrowsingManager.__syncFullHashes</h4>
 <b>__syncFullHashes</b>(<i>hashPrefixes</i>)
 <p>
@@ -186,7 +213,12 @@
 <dd>
 list of hash prefixes to get full hashes for
 </dd>
-</dl><a NAME="SafeBrowsingManager.__verifyThreatListChecksum" ID="SafeBrowsingManager.__verifyThreatListChecksum"></a>
+</dl><a NAME="SafeBrowsingManager.__threatListsUpdateTimerTimeout" ID="SafeBrowsingManager.__threatListsUpdateTimerTimeout"></a>
+<h4>SafeBrowsingManager.__threatListsUpdateTimerTimeout</h4>
+<b>__threatListsUpdateTimerTimeout</b>(<i></i>)
+<p>
+        Private slot to perform the auto update of the threat lists.
+</p><a NAME="SafeBrowsingManager.__verifyThreatListChecksum" ID="SafeBrowsingManager.__verifyThreatListChecksum"></a>
 <h4>SafeBrowsingManager.__verifyThreatListChecksum</h4>
 <b>__verifyThreatListChecksum</b>(<i>threatList, remoteChecksum</i>)
 <p>
@@ -355,6 +387,22 @@
 <dd>
 bool
 </dd>
+</dl><a NAME="SafeBrowsingManager.isUpdatingThreatLists" ID="SafeBrowsingManager.isUpdatingThreatLists"></a>
+<h4>SafeBrowsingManager.isUpdatingThreatLists</h4>
+<b>isUpdatingThreatLists</b>(<i></i>)
+<p>
+        Public method to check, if we are in the process of updating the
+        threat lists.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating an update process is active
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="SafeBrowsingManager.lookupUrl" ID="SafeBrowsingManager.lookupUrl"></a>
 <h4>SafeBrowsingManager.lookupUrl</h4>
 <b>lookupUrl</b>(<i>url</i>)
--- a/Preferences/__init__.py	Tue Aug 08 10:53:10 2017 +0200
+++ b/Preferences/__init__.py	Tue Aug 08 17:20:28 2017 +0200
@@ -29,7 +29,7 @@
 import sys

 from PyQt5.QtCore import QDir, QPoint, QLocale, QSettings, QFileInfo, \
-    QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo
+    QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo, QDateTime
 from PyQt5.QtGui import QColor, QFont, QPalette
 from PyQt5.QtWidgets import QInputDialog, QApplication
 from PyQt5.QtNetwork import QNetworkRequest
@@ -1126,6 +1126,8 @@
         "SafeBrowsingEnabled": True,
         "SafeBrowsingApiKey": "",       # API key
         "SafeBrowsingFilterPlatform": True,
+        "SafeBrowsingAutoUpdate": False,
+        "SafeBrowsingUpdateDateTime": QDateTime(),
     }
     if QWebEngineSettings:
         webBrowserDefaults["HelpViewerType"] = 1      # eric browser
@@ -2928,6 +2930,7 @@
                  "BookmarksToolBarVisible", "StatusBarVisible",
                  "SessionAutoSave", "LoadTabOnActivation",
                  "SafeBrowsingEnabled", "SafeBrowsingFilterPlatform",
+                 "SafeBrowsingAutoUpdate",
                  ]:
         return toBool(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
@@ -2940,6 +2943,12 @@
     elif key in ["AutoScrollDivider"]:
         return float(prefClass.settings.value(
             "WebBrowser/" + key, prefClass.webBrowserDefaults[key]))
+    elif key in ["SafeBrowsingUpdateDateTime"]:
+        dateTimeStr = prefClass.settings.value("WebBrowser/" + key)
+        if dateTimeStr is not None:
+            return QDateTime.fromString(dateTimeStr, Qt.ISODate)
+        else:
+            return prefClass.webBrowserDefaults[key]
     else:
         return prefClass.settings.value("WebBrowser/" + key,
                                         prefClass.webBrowserDefaults[key])
@@ -3002,6 +3011,10 @@
         from Utilities.crypto import pwConvert
         prefClass.settings.setValue(
             "WebBrowser/" + key, pwConvert(value, encode=True))
+    elif key in ["SafeBrowsingUpdateDateTime"]:
+        # value is a QDateTime
+        prefClass.settings.setValue("WebBrowser/" + key,
+                                    value.toString(Qt.ISODate))
     else:
         prefClass.settings.setValue("WebBrowser/" + key, value)
--- a/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Tue Aug 08 10:53:10 2017 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Tue Aug 08 17:20:28 2017 +0200
@@ -9,7 +9,7 @@

 from __future__ import unicode_literals

-from PyQt5.QtCore import pyqtSlot, Qt, QUrl
+from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QDateTime
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, \
     QApplication

@@ -51,6 +51,8 @@
         self.__apiKey = Preferences.getWebBrowser("SafeBrowsingApiKey")
         self.__filterPlatform = Preferences.getWebBrowser(
             "SafeBrowsingFilterPlatform")
+        self.__automaticUpdate = Preferences.getWebBrowser(
+            "SafeBrowsingAutoUpdate")

         self.buttonBox.setFocus()

@@ -64,6 +66,7 @@
         self.gsbGroupBox.setChecked(self.__enabled)
         self.gsbApiKeyEdit.setText(self.__apiKey)
         self.gsbFilterPlatformCheckBox.setChecked(self.__filterPlatform)
+        self.gsbAutoUpdateCheckBox.setChecked(self.__automaticUpdate)

         self.__updateCacheButtons()

@@ -107,11 +110,14 @@
         self.__enabled = self.gsbGroupBox.isChecked()
         self.__apiKey = self.gsbApiKeyEdit.text()
         self.__filterPlatform = self.gsbFilterPlatformCheckBox.isChecked()
+        self.__automaticUpdate = self.gsbAutoUpdateCheckBox.isChecked()

         Preferences.setWebBrowser("SafeBrowsingEnabled", self.__enabled)
         Preferences.setWebBrowser("SafeBrowsingApiKey", self.__apiKey)
         Preferences.setWebBrowser("SafeBrowsingFilterPlatform",
                                   self.__filterPlatform)
+        Preferences.setWebBrowser("SafeBrowsingAutoUpdate",
+                                  self.__automaticUpdate)

         self.__manager.configurationChanged()

@@ -139,9 +145,11 @@
         @rtype bool
         """
         return (
-            self.__enabled != self.gsbGroupBox.isChecked() or
-            self.__apiKey != self.gsbApiKeyEdit.text() or
-            self.__filterPlatform != self.gsbFilterPlatformCheckBox.isChecked()
+            (self.__enabled != self.gsbGroupBox.isChecked()) or
+            (self.__apiKey != self.gsbApiKeyEdit.text()) or
+            (self.__filterPlatform !=
+                self.gsbFilterPlatformCheckBox.isChecked()) or
+            (self.__automaticUpdate != self.gsbAutoUpdateCheckBox.isChecked())
         )

     def __okToClose(self):
@@ -170,6 +178,8 @@

         self.updateCacheButton.setEnabled(enable)
         self.clearCacheButton.setEnabled(enable)
+
+        self.showUpdateTimeButton.setEnabled(enable and self.__automaticUpdate)

     @pyqtSlot()
     def on_updateCacheButton_clicked(self):
@@ -237,7 +247,8 @@
         @param value progress value to be set
         @type int
         """
-        self.progressBar.setValue(value)
+        if bool(self.progressLabel.text()):
+            self.progressBar.setValue(value)

     def __resetProgress(self):
         """
@@ -300,3 +311,24 @@
         Private slot to save the configuration data.
         """
         self.__save()
+
+    @pyqtSlot()
+    def on_showUpdateTimeButton_clicked(self):
+        """
+        Private slot to show the time of the next automatic threat list update.
+        """
+        nextUpdateDateTime = Preferences.getWebBrowser(
+            "SafeBrowsingUpdateDateTime")
+        if not nextUpdateDateTime.isValid() or \
+           nextUpdateDateTime <= QDateTime.currentDateTime():
+            message = self.tr("The next automatic threat list update will be"
+                              " done now.")
+        else:
+            message = self.tr("<p>The next automatic threat list update will"
+                              " be done at <b>{0}</b>.</p>").format(
+                nextUpdateDateTime.toString("yyyy-MM-dd, HH:mm:ss"))
+
+        E5MessageBox.information(
+            self,
+            self.tr("Update Time"),
+            message)
--- a/WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui	Tue Aug 08 10:53:10 2017 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui	Tue Aug 08 17:20:28 2017 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>650</width>
-    <height>461</height>
+    <height>565</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,6 +18,56 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="iconLabel">
+       <property name="minimumSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
+       </property>
+       <property name="text">
+        <string notr="true">Icon</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
     <widget class="QGroupBox" name="gsbGroupBox">
      <property name="toolTip">
       <string>Select to enable the Google safe browsing support</string>
@@ -29,50 +79,47 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" rowspan="2">
-       <widget class="QLabel" name="iconLabel">
-        <property name="minimumSize">
-         <size>
-          <width>48</width>
-          <height>48</height>
-         </size>
+      <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 notr="true">Icon</string>
+         <string>Google Safe Browsing API Help</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="2">
-       <widget class="QCheckBox" name="gsbFilterPlatformCheckBox">
-        <property name="toolTip">
-         <string>Select to check against the current platform only</string>
-        </property>
-        <property name="text">
-         <string>Adjust to current platform</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="label_14">
-        <property name="text">
-         <string>API Key:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
+      <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="2" column="1" colspan="2">
-       <widget class="QPushButton" name="gsbHelpButton">
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="gsbFilterPlatformCheckBox">
         <property name="toolTip">
-         <string>Press to get some help about obtaining the API key</string>
+         <string>Select to check against the current platform only</string>
         </property>
         <property name="text">
-         <string>Google Safe Browsing API Help</string>
+         <string>Adjust threat lists to current platform</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <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>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_14">
+        <property name="text">
+         <string>API Key:</string>
         </property>
        </widget>
       </item>
@@ -120,6 +167,13 @@
     </layout>
    </item>
    <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Manage Local Cache</string>
@@ -147,6 +201,23 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="Line" name="line_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="showUpdateTimeButton">
+          <property name="toolTip">
+           <string>Press to see, when the next threat list update will be done</string>
+          </property>
+          <property name="text">
+           <string>Show Update Time</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>
@@ -173,6 +244,13 @@
     </widget>
    </item>
    <item>
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>URL Check</string>
@@ -226,11 +304,13 @@
  <tabstops>
   <tabstop>gsbGroupBox</tabstop>
   <tabstop>gsbFilterPlatformCheckBox</tabstop>
+  <tabstop>gsbAutoUpdateCheckBox</tabstop>
   <tabstop>gsbApiKeyEdit</tabstop>
   <tabstop>gsbHelpButton</tabstop>
   <tabstop>saveButton</tabstop>
   <tabstop>updateCacheButton</tabstop>
   <tabstop>clearCacheButton</tabstop>
+  <tabstop>showUpdateTimeButton</tabstop>
   <tabstop>urlEdit</tabstop>
   <tabstop>urlCheckButton</tabstop>
  </tabstops>
--- a/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Tue Aug 08 10:53:10 2017 +0200
+++ b/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Tue Aug 08 17:20:28 2017 +0200
@@ -19,7 +19,8 @@
 import os
 import base64

-from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication, QUrl
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QCoreApplication, \
+    QUrl, QDateTime, QTimer

 import Preferences
 import Utilities
@@ -64,6 +65,13 @@

         self.__gsbDialog = None
         self.__setPlatforms()
+
+        self.__updatingThreatLists = False
+        self.__threatListsUpdateTimer = QTimer(self)
+        self.__threatListsUpdateTimer.setSingleShot(True)
+        self.__threatListsUpdateTimer.timeout.connect(
+            self.__threatListsUpdateTimerTimeout)
+        self.__setAutoUpdateThreatLists()

     def configurationChanged(self):
         """
@@ -84,6 +92,7 @@
             bool(self.__apiKey))

         self.__setPlatforms()
+        self.__setAutoUpdateThreatLists()

     def __setPlatforms(self):
         """
@@ -124,6 +133,69 @@
         """
         return self.__enabled and self.__apiClient.fairUseDelayExpired()

+    def __showStatusBarMessage(self, message):
+        """
+        Private method to show some message in the main window status bar.
+
+        @param message message to be shown
+        @type str
+        """
+        from WebBrowser.WebBrowserWindow import WebBrowserWindow
+        WebBrowserWindow.mainWindow().statusBar().showMessage(message, 5000)
+
+    def __setAutoUpdateThreatLists(self):
+        """
+        Private method to set auto update for the threat lists.
+        """
+        autoUpdateEnabled = Preferences.getWebBrowser("SafeBrowsingAutoUpdate")
+        if autoUpdateEnabled and self.__enabled:
+            nextUpdateDateTime = Preferences.getWebBrowser(
+                "SafeBrowsingUpdateDateTime")
+            if nextUpdateDateTime.isValid():
+                interval = \
+                    QDateTime.currentDateTime().secsTo(nextUpdateDateTime) + 2
+                # 2 seconds extra wait time; interval in milliseconds
+
+                if interval < 5:
+                    interval = 5
+                    # minimum 5 seconds interval
+            else:
+                interval = 5
+                # just wait 5 seconds
+            self.__threatListsUpdateTimer.start(interval * 1000)
+        else:
+            if self.__threatListsUpdateTimer.isActive():
+                self.__threatListsUpdateTimer.stop()
+
+    @pyqtSlot()
+    def __threatListsUpdateTimerTimeout(self):
+        """
+        Private slot to perform the auto update of the threat lists.
+        """
+        ok = False
+        if self.__enabled:
+            self.__showStatusBarMessage(self.tr("Updating threat lists..."))
+            ok = self.updateHashPrefixCache()[0]
+            if ok:
+                self.__showStatusBarMessage(
+                    self.tr("Updating threat lists done"))
+            else:
+                self.__showStatusBarMessage(
+                    self.tr("Updating threat lists failed"))
+
+        if ok:
+            nextUpdateDateTime = \
+                self.__apiClient.getFairUseDelayExpirationDateTime()
+            Preferences.setWebBrowser("SafeBrowsingUpdateDateTime",
+                                      nextUpdateDateTime)
+            self.__threatListsUpdateTimer.start(
+                (QDateTime.currentDateTime().secsTo(nextUpdateDateTime) + 2) *
+                1000)
+            # 2 seconds extra wait time; interval in milliseconds
+        else:
+            Preferences.setWebBrowser("SafeBrowsingUpdateDateTime",
+                                      QDateTime())
+
     def updateHashPrefixCache(self):
         """
         Public method to load or update the locally cached threat lists.
@@ -141,6 +213,10 @@
                     self.__apiClient.getFairUseDelayExpirationDateTime()
                     .toString("yyyy-MM-dd, HH:mm:ss"))

+        self.__updatingThreatLists = True
+        ok = True
+        errorMessage = ""
+
         # step 1: remove expired hashes
         self.__cache.cleanupFullHashes()

@@ -209,12 +285,24 @@
                 self.__cache.updateThreatListClientState(
                     responseThreatList, response["newClientState"])
             else:
-                return False, \
-                    self.tr("Local cache checksum does not match the server."
-                            " Consider cleaning the cache. Threat update has"
-                            " been aborted.")
+                ok = False
+                errorMessage = self.tr(
+                    "Local cache checksum does not match the server. Consider"
+                    " cleaning the cache. Threat update has been aborted.")
+
+        self.__updatingThreatLists = False

-        return True, ""
+        return ok, errorMessage
+
+    def isUpdatingThreatLists(self):
+        """
+        Public method to check, if we are in the process of updating the
+        threat lists.
+
+        @return flag indicating an update process is active
+        @rtype bool
+        """
+        return self.__updatingThreatLists

     def __verifyThreatListChecksum(self, threatList, remoteChecksum):
         """
--- a/i18n/eric6_cs.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_cs.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -41076,27 +41076,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50943,153 +50943,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished">URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished">URL:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51104,35 +51144,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -74765,17 +74820,14 @@
     </message>
 </context>
 <context>
-    <name>_StrikeThroughExtension</name>
-</context>
-<context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation type="unfinished">Generování hlavního okna...</translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_de.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -40165,27 +40165,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
@@ -49994,154 +49994,194 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation>Safe Browsing Verwaltung</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation>Auswählen, um die Unterstützung für Google Safe Browsing zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation>Google Safe Browsing aktivieren</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <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"/>
+        <source>API Key:</source>
+        <translation>API Schlüssel:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <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"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation>Google Safe Browsing API Hilfe</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Update Cache</source>
+        <translation>Zwischenspeicher aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <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"/>
+        <source>Clear Cache</source>
+        <translation>Zwischenspeicher löschen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation>%v/%m</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation>URL Prüfung</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <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"/>
+        <source>Check URL</source>
+        <translation>URL prüfen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <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"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation>Safe Browsing Zwischenspeicher aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation>Safe Browsing Zwischenspeicher löschen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation>nur aktuelle Plattform prüfen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation>API Schlüssel:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <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="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation>Google Safe Browsing API Hilfe</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <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="103"/>
-        <source>Save Configuration</source>
-        <translation>Konfiguration speichern</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation>Lokalen Zwischenspeicher verwalten</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <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="136"/>
-        <source>Update Cache</source>
-        <translation>Zwischenspeicher aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <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="146"/>
-        <source>Clear Cache</source>
-        <translation>Zwischenspeicher löschen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation>%v/%m</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation>URL Prüfung</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <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="289"/>
-        <source>Check URL</source>
-        <translation>URL prüfen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation>Der Dialog enthält ungesicherte Änderungen.</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation>Safe Browsing Zwischenspeicher aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation>Safe Browsing Zwischenspeicher löschen</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation>Zeige Aktualisierungszeit</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
+        <translation>Aktualisierungszeit</translation>
     </message>
 </context>
 <context>
@@ -50155,35 +50195,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation>Safe Browsing ist deaktiviert.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation>Aktualisiere Bedrohungslisten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation>Lösche überholte Bedrohungslisten</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation>Aktualisiere Hashpräfixe</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation>Aktualisiere Bedrohungslisten...</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation>Aktualisierung der Bedrohungslisten abgeschlossen</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation>Aktualisierung der Bedrohungslisten fehlgeschlagen</translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -73490,12 +73545,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation>Starte...</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation>Erzeuge das Hauptfenster...</translation>
     </message>
--- a/i18n/eric6_empty.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_empty.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -39959,27 +39959,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49591,153 +49591,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -49752,35 +49792,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -72882,12 +72937,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_en.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -39998,27 +39998,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49632,153 +49632,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -49793,35 +49833,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -72927,12 +72982,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_es.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -40186,27 +40186,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -49979,155 +49979,200 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation>Gestión de Navegación Segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation>Seleccionar para habilitar el soporte de Google de navegación segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation>Habilitar Navegación Segura de Google</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <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="51"/>
         <source>Adjust to current platform</source>
-        <translation>Ajustar a la plataforma actual</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
+        <translation type="obsolete">Ajustar a la plataforma actual</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
         <source>API Key:</source>
         <translation>API Key:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <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="72"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <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="83"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
         <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="100"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
         <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="103"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
         <source>Save Configuration</source>
         <translation>Guardar Configuración</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
+        <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="133"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
         <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="136"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
         <source>Update Cache</source>
         <translation>Actualizar Caché</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <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="146"/>
-        <source>Clear Cache</source>
-        <translation>Limpiar Caché</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation>%v/%m</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation>Comprobación de URL</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <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"/>
+        <source>Clear Cache</source>
+        <translation>Limpiar Caché</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation>%v/%m</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation>Comprobación de URL</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
         <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="289"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
         <source>Check URL</source>
         <translation>Comprobar URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <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="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
         <source>Update Safe Browsing Cache</source>
         <translation>Actualizar Caché de Navegación Segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
         <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="191"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
         <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="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
         <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="208"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
         <source>Clear Safe Browsing Cache</source>
         <translation>Limpiear Caché de Navegación Segura</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
         <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="281"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
         <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="289"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
         <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>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -50140,35 +50185,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation>La Navegación Segura está deshabilitada.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation>Actualizando listas de amenazas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation>Borrando listas obsoletas de amenazas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation>Acutalizando prefijos de hash</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -73472,12 +73532,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation>Comenzando...</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation>Generando Ventana Principal...</translation>
     </message>
--- a/i18n/eric6_fr.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_fr.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -40857,27 +40857,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50729,153 +50729,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished">URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished">URL:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50890,35 +50930,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -74583,12 +74638,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation type="unfinished">Création de la fenêtre principale...</translation>
     </message>
--- a/i18n/eric6_it.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_it.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -41331,27 +41331,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51212,153 +51212,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished">URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished">URL:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51373,35 +51413,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -75176,12 +75231,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation type="unfinished">Inizio...</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation type="unfinished">Generazione Main Window...</translation>
     </message>
--- a/i18n/eric6_pt.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_pt.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -41471,27 +41471,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -51204,153 +51204,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished">URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished">URL:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -51365,35 +51405,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -74915,12 +74970,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation>A iniciar...</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation>A criar a Janela Principal...</translation>
     </message>
--- a/i18n/eric6_ru.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_ru.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -40273,27 +40273,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
@@ -50157,155 +50157,200 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation>Управление Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation>Разрешить поддержку безопасного просмотра Google</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation>Служба Google Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation>Разрешить проверку только для текущей платформы</translation>
     </message>
     <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
         <source>Adjust to current platform</source>
-        <translation>Уточнить текущую платформу</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
+        <translation type="obsolete">Уточнить текущую платформу</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
         <source>API Key:</source>
         <translation>API ключ:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
         <source>Enter the Google Safe Browsing API key</source>
         <translation>Введите API ключ Safe Browsing Google</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
         <source>Press to get some help about obtaining the API key</source>
         <translation>Справка о получении API ключа</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="83"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/>
         <source>Google Safe Browsing API Help</source>
         <translation>Справка Google Safe Browsing API</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
         <source>Press to save the current configuration settings</source>
         <translation>Сохранить текущие параметры конфигурации</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
         <source>Save Configuration</source>
         <translation>Сохранить конфигурацию</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/>
         <source>Manage Local Cache</source>
         <translation>Управление локальным кэшем</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/>
         <source>Press to update the local cache database</source>
         <translation>Обновить базу данных локального кэша</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
         <source>Update Cache</source>
         <translation>Обновить кэш</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation>Очистить базу данных локального кэша</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation>Очистить кэш</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation>%v/%m</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation>Проверка URL</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation>Очистить базу данных локального кэша</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation>Очистить кэш</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation>%v/%m</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation>Проверка URL</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
         <source>Press to check the entered URL</source>
         <translation>Проверить введенный URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
         <source>Check URL</source>
         <translation>Проверить URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>The dialog contains unsaved changes.</source>
         <translation>Диалог содержит несохраненные изменения.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
         <source>Update Safe Browsing Cache</source>
         <translation>Обновить кэш Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
         <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="191"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/>
         <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="197"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
         <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="208"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
         <source>Clear Safe Browsing Cache</source>
         <translation>Очистить кэш Safe Browsing</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
         <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="281"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/>
         <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="289"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
         <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>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SafeBrowsingLabel</name>
@@ -50318,35 +50363,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation>Сервис Safe Browsing отключен.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation>Обновление списков угроз</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation>Удаление устаревших списков угроз</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation>Обновление хеш-префиксов</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -73734,12 +73794,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation>Запуск...</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation>Создание главного окна...</translation>
     </message>
--- a/i18n/eric6_tr.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_tr.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -40907,27 +40907,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50639,153 +50639,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished">URL:</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished">URL:</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50800,35 +50840,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -74408,12 +74463,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation type="unfinished">Anapencere üretiliyor...</translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Tue Aug 08 10:53:10 2017 +0200
+++ b/i18n/eric6_zh_CN.ts	Tue Aug 08 17:20:28 2017 +0200
@@ -40904,27 +40904,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1590"/>
+        <location filename="../Preferences/__init__.py" line="1592"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1618"/>
+        <location filename="../Preferences/__init__.py" line="1620"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select Python{0} Interpreter</source>
         <translation>选择 Python{0} 解释器</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1720"/>
+        <location filename="../Preferences/__init__.py" line="1722"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>选择要使用的 Python{0} 解释器：</translation>
     </message>
@@ -50784,153 +50784,193 @@
 <context>
     <name>SafeBrowsingDialog</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
         <source>Safe Browsing Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/>
         <source>Select to enable the Google safe browsing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/>
         <source>Enable Google Safe Browsing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/>
         <source>Select to check against the current platform only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/>
+        <source>API Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/>
+        <source>Enter the Google Safe Browsing API key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/>
+        <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"/>
+        <source>Google Safe Browsing API Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/>
+        <source>Press to save the current configuration settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/>
+        <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"/>
+        <source>Press to update the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/>
+        <source>Update Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
+        <source>Press to clear the local cache database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/>
+        <source>Clear Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/>
+        <source>%v/%m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/>
+        <source>URL Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/>
+        <source>URL:</source>
+        <translation type="unfinished">URL：</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/>
+        <source>Press to check the entered URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/>
+        <source>Check URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/>
+        <source>The dialog contains unsaved changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/>
+        <source>Update Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Clear Safe Browsing Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/>
+        <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"/>
+        <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"/>
+        <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>
+    <message>
         <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/>
-        <source>Adjust to current platform</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/>
-        <source>API Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/>
-        <source>Enter the Google Safe Browsing API key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/>
-        <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="83"/>
-        <source>Google Safe Browsing API Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/>
-        <source>Press to save the current configuration settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/>
-        <source>Save Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/>
-        <source>Manage Local Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/>
-        <source>Press to update the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/>
-        <source>Update Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/>
-        <source>Press to clear the local cache database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/>
-        <source>Clear Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/>
-        <source>%v/%m</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/>
-        <source>URL Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/>
-        <source>URL:</source>
-        <translation type="unfinished">URL：</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/>
-        <source>Press to check the entered URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/>
-        <source>Check URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/>
-        <source>The dialog contains unsaved changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/>
-        <source>Update Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/>
-        <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="191"/>
-        <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="197"/>
-        <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="208"/>
-        <source>Clear Safe Browsing Cache</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/>
-        <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="281"/>
-        <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="289"/>
-        <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>
+        <source>&lt;h2&gt;Google Safe Browsing&lt;/h2&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/>
+        <source>Adjust threat lists to current platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/>
+        <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"/>
+        <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"/>
+        <source>Show Update Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/>
+        <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"/>
+        <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"/>
+        <source>Update Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -50945,35 +50985,50 @@
 <context>
     <name>SafeBrowsingManager</name>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/>
         <source>Safe Browsing is disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/>
         <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="154"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/>
         <source>Updating threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/>
         <source>Deleting obsolete threat lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/>
         <source>Updating hash prefixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/>
         <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="177"/>
+        <source>Updating threat lists...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/>
+        <source>Updating threat lists done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/>
+        <source>Updating threat lists failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SearchReplaceWidget</name>
@@ -74649,12 +74704,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="350"/>
+        <location filename="../eric6.py" line="352"/>
         <source>Starting...</source>
         <translation>正在启动…</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="355"/>
+        <location filename="../eric6.py" line="357"/>
         <source>Generating Main Window...</source>
         <translation>正在产生主窗口…</translation>
     </message>
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.SafeBrowsingDialog.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html		file \| annotate \| diff \| comparison \| revisions
Preferences/__init__.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
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