Mercurial Repositories > eric / changeset
changeset
Web Browser NG, Safe Browsing: improved error handling
Thu, 12 Apr 2018 19:12:36 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 12 Apr 2018 19:12:36 +0200
- changeset 6234
- fb1f9e681848
- parent 6233
- a64b986abb54
- child 6235
- 0e6a395ecfe8
Web Browser NG, Safe Browsing: improved error handling
--- a/APIs/Python3/eric6.api Wed Apr 11 19:57:23 2018 +0200 +++ b/APIs/Python3/eric6.api Thu Apr 12 19:12:36 2018 +0200 @@ -11654,6 +11654,9 @@ eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.ClientId?7 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.ClientVersion?7 eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.GsbUrlTemplate?7 +eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.definedPlatformTypes?4() +eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.definedThreatEntryTypes?4() +eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.definedThreatTypes?4() eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.fairUseDelayExpired?4() eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.getFairUseDelayExpirationDateTime?4() eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.SafeBrowsingAPIClient.getFullHashes?4(prefixes, clientState)
--- a/Documentation/Help/source.qhp Wed Apr 11 19:57:23 2018 +0200 +++ b/Documentation/Help/source.qhp Thu Apr 12 19:12:36 2018 +0200 @@ -13741,6 +13741,9 @@ <keyword name="SafeBrowsingAPIClient (Module)" id="SafeBrowsingAPIClient (Module)" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html" /> <keyword name="SafeBrowsingAPIClient.__extractData" id="SafeBrowsingAPIClient.__extractData" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.__extractData" /> <keyword name="SafeBrowsingAPIClient.__setWaitDuration" id="SafeBrowsingAPIClient.__setWaitDuration" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.__setWaitDuration" /> + <keyword name="SafeBrowsingAPIClient.definedPlatformTypes" id="SafeBrowsingAPIClient.definedPlatformTypes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.definedPlatformTypes" /> + <keyword name="SafeBrowsingAPIClient.definedThreatEntryTypes" id="SafeBrowsingAPIClient.definedThreatEntryTypes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.definedThreatEntryTypes" /> + <keyword name="SafeBrowsingAPIClient.definedThreatTypes" id="SafeBrowsingAPIClient.definedThreatTypes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.definedThreatTypes" /> <keyword name="SafeBrowsingAPIClient.fairUseDelayExpired" id="SafeBrowsingAPIClient.fairUseDelayExpired" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.fairUseDelayExpired" /> <keyword name="SafeBrowsingAPIClient.getFairUseDelayExpirationDateTime" id="SafeBrowsingAPIClient.getFairUseDelayExpirationDateTime" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.getFairUseDelayExpirationDateTime" /> <keyword name="SafeBrowsingAPIClient.getFullHashes" id="SafeBrowsingAPIClient.getFullHashes" ref="eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html#SafeBrowsingAPIClient.getFullHashes" />
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html Wed Apr 11 19:57:23 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingAPIClient.html Thu Apr 12 19:12:36 2018 +0200 @@ -59,6 +59,15 @@ <h3>Class Methods</h3> <table> <tr> +<td><a href="#SafeBrowsingAPIClient.definedPlatformTypes">definedPlatformTypes</a></td> +<td>Class method to get all platform types defined in API v4.</td> +</tr><tr> +<td><a href="#SafeBrowsingAPIClient.definedThreatEntryTypes">definedThreatEntryTypes</a></td> +<td>Class method to get all threat entry types defined in API v4.</td> +</tr><tr> +<td><a href="#SafeBrowsingAPIClient.definedThreatTypes">definedThreatTypes</a></td> +<td>Class method to get all threat types defined in API v4.</td> +</tr><tr> <td><a href="#SafeBrowsingAPIClient.getPlatformString">getPlatformString</a></td> <td>Class method to get the platform string for a given platform type.</td> </tr><tr> @@ -113,7 +122,52 @@ <table> <tr><td>None</td></tr> </table> -<a NAME="SafeBrowsingAPIClient.getPlatformString" ID="SafeBrowsingAPIClient.getPlatformString"></a> +<a NAME="SafeBrowsingAPIClient.definedPlatformTypes" ID="SafeBrowsingAPIClient.definedPlatformTypes"></a> +<h4>SafeBrowsingAPIClient.definedPlatformTypes (class method)</h4> +<b>definedPlatformTypes</b>(<i></i>) +<p> + Class method to get all platform types defined in API v4. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all defined platform types +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl><a NAME="SafeBrowsingAPIClient.definedThreatEntryTypes" ID="SafeBrowsingAPIClient.definedThreatEntryTypes"></a> +<h4>SafeBrowsingAPIClient.definedThreatEntryTypes (class method)</h4> +<b>definedThreatEntryTypes</b>(<i></i>) +<p> + Class method to get all threat entry types defined in API v4. +</p><dl> +<dt>Returns:</dt> +<dd> +list of all defined threat entry types +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl><a NAME="SafeBrowsingAPIClient.definedThreatTypes" ID="SafeBrowsingAPIClient.definedThreatTypes"></a> +<h4>SafeBrowsingAPIClient.definedThreatTypes (class method)</h4> +<b>definedThreatTypes</b>(<i></i>) +<p> + Class method to get all threat types defined in API v4. +</p><dl> +<dt>Returns:</dt> +<dd> +list of defined threat types +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl><a NAME="SafeBrowsingAPIClient.getPlatformString" ID="SafeBrowsingAPIClient.getPlatformString"></a> <h4>SafeBrowsingAPIClient.getPlatformString (class method)</h4> <b>getPlatformString</b>(<i>platformType</i>) <p> @@ -328,13 +382,13 @@ </p><dl> <dt>Returns:</dt> <dd> -list of threat lists +tuple containing list of threat lists and an error message </dd> </dl><dl> <dt>Return Type:</dt> <dd> -list of dict containing 'threatType', 'platformType' and - 'threatEntryType' +tuple of (list of dict containing 'threatType', 'platformType' + and 'threatEntryType', bool) </dd> </dl><a NAME="SafeBrowsingAPIClient.getThreatsUpdate" ID="SafeBrowsingAPIClient.getThreatsUpdate"></a> <h4>SafeBrowsingAPIClient.getThreatsUpdate</h4> @@ -350,12 +404,13 @@ </dl><dl> <dt>Returns:</dt> <dd> -list of threat updates +tuple containing the list of threat updates and an error + message </dd> </dl><dl> <dt>Return Type:</dt> <dd> -list of dict +tuple of (list of dict, bool) </dd> </dl><a NAME="SafeBrowsingAPIClient.lookupUrl" ID="SafeBrowsingAPIClient.lookupUrl"></a> <h4>SafeBrowsingAPIClient.lookupUrl</h4> @@ -373,12 +428,13 @@ </dl><dl> <dt>Returns:</dt> <dd> -list of threat list info objects +tuple containing the list of threat list info objects and + an error message </dd> </dl><dl> <dt>Return Type:</dt> <dd> -list of ThreatList +tuple of (list of ThreatList, str) </dd> </dl><a NAME="SafeBrowsingAPIClient.setApiKey" ID="SafeBrowsingAPIClient.setApiKey"></a> <h4>SafeBrowsingAPIClient.setApiKey</h4>
--- a/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html Wed Apr 11 19:57:23 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.SafeBrowsing.SafeBrowsingManager.html Thu Apr 12 19:12:36 2018 +0200 @@ -432,12 +432,13 @@ </dl><dl> <dt>Returns:</dt> <dd> -list of threat lists the URL was found in +tuple containing the list of threat lists the URL was found in + and an error message </dd> </dl><dl> <dt>Return Type:</dt> <dd> -list of ThreatList +tuple of (list of ThreatList, str) </dd> </dl><dl> <dt>Raises <b>ValueError</b>:</dt>
--- a/WebBrowser/Download/DownloadManager.py Wed Apr 11 19:57:23 2018 +0200 +++ b/WebBrowser/Download/DownloadManager.py Thu Apr 12 19:12:36 2018 +0200 @@ -241,8 +241,8 @@ from WebBrowser.SafeBrowsing.SafeBrowsingManager import \ SafeBrowsingManager if SafeBrowsingManager.isEnabled(): - threatLists = WebBrowserWindow.safeBrowsingManager().lookupUrl(url) - # TODO: handle threatLists being None (indicating a lookup error) + threatLists = \ + WebBrowserWindow.safeBrowsingManager().lookupUrl(url)[0] if threatLists: threatMessages = WebBrowserWindow.safeBrowsingManager()\ .getThreatMessages(threatLists)
--- a/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py Wed Apr 11 19:57:23 2018 +0200 +++ b/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py Thu Apr 12 19:12:36 2018 +0200 @@ -62,7 +62,7 @@ # key: URL as string # value: dictionary with these entries: # "validUntil": (QDateTime) - # "threatInfo": (ThreatList) + # "threatInfo": (list of ThreatList) def setApiKey(self, apiKey): """ @@ -77,9 +77,9 @@ """ Public method to retrieve all available threat lists. - @return list of threat lists - @rtype list of dict containing 'threatType', 'platformType' and - 'threatEntryType' + @return tuple containing list of threat lists and an error message + @rtype tuple of (list of dict containing 'threatType', 'platformType' + and 'threatEntryType', bool) """ url = QUrl(self.GsbUrlTemplate.format("threatLists", self.__apiKey)) req = QNetworkRequest(url) @@ -90,14 +90,16 @@ # max. 200 ms processing res = None + error = "" if reply.error() != QNetworkReply.NoError: - self.networkError.emit(reply.errorString()) + error = reply.errorString() + self.networkError.emit(error) else: result = self.__extractData(reply) res = result["threatLists"] reply.deleteLater() - return res + return res, error ####################################################################### ## Methods below implement the 'Update API (v4)' @@ -110,8 +112,9 @@ @param clientStates dictionary of client states with keys like (threatType, platformType, threatEntryType) @type dict - @return list of threat updates - @rtype list of dict + @return tuple containing the list of threat updates and an error + message + @rtype tuple of (list of dict, bool) """ requestBody = { "client": { @@ -147,14 +150,16 @@ # max. 200 ms processing res = None + error = "" if reply.error() != QNetworkReply.NoError: - self.networkError.emit(reply.errorString()) + error = reply.errorString() + self.networkError.emit(error) else: result = self.__extractData(reply) res = result["listUpdateResponses"] reply.deleteLater() - return res + return res, error def getFullHashes(self, prefixes, clientState): """ @@ -212,7 +217,7 @@ QCoreApplication.processEvents(QEventLoop.AllEvents, 200) # max. 200 ms processing - res = None + res = [] if reply.error() != QNetworkReply.NoError: self.networkError.emit(reply.errorString()) else: @@ -281,34 +286,38 @@ @type QUrl @param platforms list of platform types to check against @type list of str - @return list of threat list info objects - @rtype list of ThreatList + @return tuple containing the list of threat list info objects and + an error message + @rtype tuple of (list of ThreatList, str) """ + error = "" + # sanitize the URL by removing user info and query data url = url.adjusted( QUrl.RemoveUserInfo | QUrl.RemoveQuery | QUrl.RemoveFragment ) urlStr = url.toString() + + # check the local cache first if urlStr in self.__lookupApiCache: if self.__lookupApiCache[urlStr]["validUntil"] > \ QDateTime.currentDateTime(): # cached entry is still valid - return self.__lookupApiCache[urlStr]["threatInfo"] + return self.__lookupApiCache[urlStr]["threatInfo"], error else: del self.__lookupApiCache[urlStr] + # no valid entry found, ask the safe browsing server requestBody = { "client": { "clientId": self.ClientId, "clientVersion": self.ClientVersion, }, "threatInfo": { - "threatTypes": [ - "MALWARE", "SOCIAL_ENGINEERING", "UNWANTED_SOFTWARE", - "POTENTIALLY_HARMFUL_APPLICATION", - ], + "threatTypes": SafeBrowsingAPIClient.definedThreatTypes(), "platformTypes": platforms, - "threatEntryTypes": ["URL", "EXECUTABLE"], + "threatEntryTypes": + SafeBrowsingAPIClient.definedThreatEntryTypes(), "threatEntries": [ {"url": urlStr}, ], @@ -328,7 +337,8 @@ threats = [] if reply.error() != QNetworkReply.NoError: - self.networkError.emit(reply.errorString()) + error = reply.errorString() + self.networkError.emit(error) else: res = json.loads(str(reply.readAll(), "utf-8")) if res and "matches" in res: @@ -355,7 +365,7 @@ } reply.deleteLater() - return threats + return threats, error ####################################################################### ## Methods below implement global (class wide) functionality @@ -449,6 +459,50 @@ return displayString @classmethod + def definedThreatTypes(cls): + """ + Class method to get all threat types defined in API v4. + + @return list of defined threat types + @rtype list of str + """ + return [ + "THREAT_TYPE_UNSPECIFIED", "MALWARE", "SOCIAL_ENGINEERING", + "UNWANTED_SOFTWARE", "POTENTIALLY_HARMFUL_APPLICATION", + ] + + @classmethod + def getThreatEntryString(cls, threatEntry): + """ + Class method to get the threat entry string. + + @param threatEntry threat entry type as defined in the v4 API + @type str + @return threat entry string + @rtype str + """ + if threatEntry == "URL": + return "URL" + elif threatEntry == "EXECUTABLE": + return QCoreApplication.translate( + "SafeBrowsingAPI", "executable program") + else: + return QCoreApplication.translate( + "SafeBrowsingAPI", "unknown type") + + @classmethod + def definedThreatEntryTypes(cls): + """ + Class method to get all threat entry types defined in API v4. + + @return list of all defined threat entry types + @rtype list of str + """ + return [ + "THREAT_ENTRY_TYPE_UNSPECIFIED", "URL", "EXECUTABLE", + ] + + @classmethod def getPlatformString(cls, platformType): """ Class method to get the platform string for a given platform type. @@ -480,25 +534,6 @@ "SafeBrowsingAPI", "unknown platform") @classmethod - def getThreatEntryString(cls, threatEntry): - """ - Class method to get the threat entry string. - - @param threatEntry threat entry type as defined in the v4 API - @type str - @return threat entry string - @rtype str - """ - if threatEntry == "URL": - return "URL" - elif threatEntry == "EXECUTABLE": - return QCoreApplication.translate( - "SafeBrowsingAPI", "executable program") - else: - return QCoreApplication.translate( - "SafeBrowsingAPI", "unknown type") - - @classmethod def getPlatformTypes(cls, platform): """ Class method to get the platform types for a given platform. @@ -523,3 +558,16 @@ raise ValueError("Unsupported platform") return platformTypes + + @classmethod + def definedPlatformTypes(cls): + """ + Class method to get all platform types defined in API v4. + + @return list of all defined platform types + @rtype list of str + """ + return [ + "PLATFORM_TYPE_UNSPECIFIED", "WINDOWS", "LINUX", "ANDROID", "OSX", + "IOS", "ANY_PLATFORM", "ALL_PLATFORMS", "CHROME", + ]
--- a/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py Wed Apr 11 19:57:23 2018 +0200 +++ b/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py Thu Apr 12 19:12:36 2018 +0200 @@ -293,24 +293,31 @@ # urlStr = self.urlEdit.text() url = QUrl.fromUserInput(urlStr) - threatLists = self.__manager.lookupUrl(url) - # TODO: handle threatLists being None (indicating a lookup error) + threatLists, error = self.__manager.lookupUrl(url) - if threatLists: + if error: + E5MessageBox.warning( + self, + self.tr("Check URL"), + self.tr("<p>The Google Safe Browsing Server reported an" + " error.</p><p>{0}</p>").format(error) + ) + elif threatLists: threatMessages = self.__manager.getThreatMessages(threatLists) E5MessageBox.warning( self, self.tr("Check URL"), - self.tr("<p>The URL <b>{0}</b> was found in the Safe Browsing" - " Database.</p>{1}").format(urlStr, - "".join(threatMessages)) + self.tr("<p>The URL <b>{0}</b> was found in the Safe" + " Browsing Database.</p>{1}").format( + urlStr, "".join(threatMessages)) ) else: E5MessageBox.information( self, self.tr("Check URL"), self.tr("<p>The URL <b>{0}</b> was not found in the Safe" - " Browsing Database and may be considered safe.</p>") + " Browsing Database and may be considered safe." + "</p>") .format(urlStr) )
--- a/WebBrowser/SafeBrowsing/SafeBrowsingManager.py Wed Apr 11 19:57:23 2018 +0200 +++ b/WebBrowser/SafeBrowsing/SafeBrowsingManager.py Thu Apr 12 19:12:36 2018 +0200 @@ -260,7 +260,10 @@ threatListsForRemove = {} for threatList, _clientState in self.__cache.getThreatLists(): threatListsForRemove[repr(threatList)] = threatList - threatLists = self.__apiClient.getThreatLists() + threatLists, error = self.__apiClient.getThreatLists() + if error: + return False, error + maximum = len(threatLists) current = 0 self.progressMessage.emit(self.tr("Updating threat lists"), maximum) @@ -292,8 +295,11 @@ clientStates = {} for threatList, clientState in threatLists: clientStates[threatList.asTuple()] = clientState - threatsUpdateResponses = \ + threatsUpdateResponses, error = \ self.__apiClient.getThreatsUpdate(clientStates) + if error: + return False, error + maximum = len(threatsUpdateResponses) current = 0 self.progressMessage.emit(self.tr("Updating hash prefixes"), maximum) @@ -379,11 +385,11 @@ @param url URL to be checked @type str or QUrl - @return list of threat lists the URL was found in - @rtype list of ThreatList + @return tuple containing the list of threat lists the URL was found in + and an error message + @rtype tuple of (list of ThreatList, str) @exception ValueError raised for an invalid URL """ - # TODO: extend to return error string in case of issues if self.isEnabled(): if self.__useLookupApi: if isinstance(url, str): @@ -392,9 +398,9 @@ if url.isEmpty(): raise ValueError("Empty URL given.") - listNames = self.__apiClient.lookupUrl(url, self.__platforms) - if listNames: - return listNames + listNames, error = \ + self.__apiClient.lookupUrl(url, self.__platforms) + return listNames, error else: if isinstance(url, QUrl): urlStr = url.toString().strip() @@ -406,10 +412,10 @@ urlHashes = SafeBrowsingUrl(urlStr).hashes() listNames = self.__lookupHashes(urlHashes) - if listNames: - return listNames + + return listNames, "" - return None + return None, "" def __lookupHashes(self, fullHashes): """
--- a/WebBrowser/WebBrowserPage.py Wed Apr 11 19:57:23 2018 +0200 +++ b/WebBrowser/WebBrowserPage.py Thu Apr 12 19:12:36 2018 +0200 @@ -149,11 +149,11 @@ if SafeBrowsingManager.isEnabled() and \ url.scheme() not in \ SafeBrowsingManager.getIgnoreSchemes(): - threatLists = WebBrowserWindow.safeBrowsingManager().lookupUrl(url) + threatLists = \ + WebBrowserWindow.safeBrowsingManager().lookupUrl(url)[0] if threatLists: threatMessages = WebBrowserWindow.safeBrowsingManager()\ .getThreatMessages(threatLists) - # TODO: handle threatLists being None (indicating a lookup error) res = E5MessageBox.warning( WebBrowserWindow.getWindow(), self.tr("Suspicuous URL detected"),
--- a/i18n/eric6_cs.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_cs.ts Thu Apr 12 19:12:36 2018 +0200 @@ -60650,87 +60650,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -60828,7 +60828,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -60868,12 +60868,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -60903,17 +60903,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -60932,6 +60932,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -60954,22 +60959,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_de.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_de.ts Thu Apr 12 19:12:36 2018 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1972,8 +1973,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="170"/> - <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New Tab Ctrl+LMB</source> + <translation>In neuem Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="174"/> @@ -2051,8 +2052,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New Tab Ctrl+LMB</source> + <translation>In neuem Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="95"/> @@ -24860,8 +24861,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1220"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1311"/> @@ -59583,87 +59584,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation><h3>Warnung vor Schadsoftware</h3><p>Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, Schadsoftware zum Diebstahl oder zur Zerstörung ihrer Daten auf ihrem Computer zu installieren.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation><h3>Phishing Warnung</h3><p>Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, sie zu veranlassen, gefährliche Onlineaktivitäten wie z.B. Eingabe von Kennwörtern oder persönlicher Informationen durchzuführen. Dies geschieht meist durch eine gefälschte Website.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation><h3>Warnung vor unerwünschter Software</h3><p>Die Software, die sie herunterladen möchten, könnte möglicherweise ihre Surf- oder Computererfahrung negativ beeinträchtigen.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation><h3>Potentiell gefährliche Anwendung</h3><p>Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, sie zur Installation einer Anwendung, die ihre Surf- und Computererfahrung negativ beeinflussen könnte, zu verleiten.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation><h3>Warnung vor unbekannter Gefahr</h3>Die Website, die sie besuchen wollen, wurde in der Safe Browsing Datenbank gefunden, ist jedoch bisher noch nicht klassifiziert.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation>Schadsoftware</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation>Phishing</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation>Unerwünschte Software</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation>Gefährliche Anwendung</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation>Bösartiges Binary</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation>Unbekannte Gefahr</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation>einige der definierten Plattformen</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation>ale definierten Plattformen</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation>unbekannte Plattform</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation>ausführbares Programm</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation>unbekannter Typ</translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation><h3>Warnung vor unerwünschter Software</h3><p>Die Software, die sie herunterladen möchten, könnte möglicherweise ihre Surf- oder Computererfahrung negativ beeinträchtigen.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation><h3>Potentiell gefährliche Anwendung</h3><p>Die Website, die sie besuchen wollen, könnte möglicherweise versuchen, sie zur Installation einer Anwendung, die ihre Surf- und Computererfahrung negativ beeinflussen könnte, zu verleiten.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation><h3>Warnung vor unbekannter Gefahr</h3>Die Website, die sie besuchen wollen, wurde in der Safe Browsing Datenbank gefunden, ist jedoch bisher noch nicht klassifiziert.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation>Schadsoftware</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation>Phishing</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation>Unerwünschte Software</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation>Gefährliche Anwendung</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation>Bösartiges Binary</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation>Unbekannte Gefahr</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation>einige der definierten Plattformen</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation>ale definierten Plattformen</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation>unbekannte Plattform</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation>ausführbares Programm</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation>unbekannter Typ</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation><h3>Warnung vor bösartigem Binary</h3><p>Die Software, die sie herunterladen möchten, könnte möglicherweise für ihren Computer gefährlich sein.</p></translation> </message> @@ -59761,7 +59762,7 @@ <translation>Drücken, um die eingegebene URL zu prüfen</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation>URL prüfen</translation> </message> @@ -59801,12 +59802,12 @@ <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="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation><p>Die URL <b>{0}</b> wurde in der Safe Browsing Datenbank gefunden.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation><p>Die URL <b>{0}</b> wurde nicht in der Safe Browsing Datenbank gefunden und kann als sicher betrachtet werden.</p></translation> </message> @@ -59836,17 +59837,17 @@ <translation>Zeige Aktualisierungszeit</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation><p>Die nächste Aktualisierung der Bedrohungslisten wird um <b>{0}</b> ausgeführt.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation>Aktualisierungszeit</translation> </message> @@ -59865,6 +59866,11 @@ <source>Manage Local Cache (Update API only)</source> <translation>Lokalen Zwischenspeicher verwalten (nur für Update API)</translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation><p>Der Google Safe Browsing Server meldete einen Fehler.</p><p>{0}</p></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -59887,22 +59893,22 @@ <translation>Die 'Fair Use' Wartezeit ist noch nicht abgelaufen. Ablaufzeitpunkt ist {0}.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation>Aktualisiere Bedrohungslisten</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation>Lösche überholte Bedrohungslisten</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation>Aktualisiere Hashpräfixe</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <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> @@ -82289,8 +82295,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="635"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="641"/>
--- a/i18n/eric6_empty.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_empty.ts Thu Apr 12 19:12:36 2018 +0200 @@ -59135,87 +59135,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -59313,7 +59313,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -59353,12 +59353,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -59388,17 +59388,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -59417,6 +59417,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -59439,22 +59444,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_en.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_en.ts Thu Apr 12 19:12:36 2018 +0200 @@ -59184,87 +59184,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -59362,7 +59362,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -59402,12 +59402,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -59437,17 +59437,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -59466,6 +59466,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -59488,22 +59493,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_es.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_es.ts Thu Apr 12 19:12:36 2018 +0200 @@ -59563,87 +59563,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation><h3>Advertencia de Malware</h3><p>Este sitio web podría tratar de instalar programas dañinos en su ordenador con la finalidad de robar o destruir datos.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation><h3>Advertencia de Phishing</h3><p>Este sitio web podría tratar de engañarle para hacer algo peligroso online, tal como revelar contraseñas o información personal, usualmente a través de un sitio web falsificado.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation><h3>Advertencia de Software no Deseado</h3><p>El software que se va a descargar podría afectar negativamente a la experiencia de navegación o de uso del ordenador.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation><h3>Aplicación Potencialmente Dañina</h3><p>Este sitio web podría tratar de engañarle para instalar aplicaciones que podrían afectar negativamente su experiencia de navegación.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation><h3>Advertencia de Amenaza Desconocida</h3><p>Este sitio web se ha encontrado en la Base de Datos de Navegación Segura aunque no está todavía clasificado.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation>Malware</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation>Phishing</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation>Software No Deseado</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation>Aplicación Dañina</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation>Binario Malicioso</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation>Amenaza Desconocida</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation>cualquier plataforma definida</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation>todas las plataformas definidas</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation>plataforma desconocida</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation>programa ejecutable</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation>tipo desconocido</translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation><h3>Advertencia de Software no Deseado</h3><p>El software que se va a descargar podría afectar negativamente a la experiencia de navegación o de uso del ordenador.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation><h3>Aplicación Potencialmente Dañina</h3><p>Este sitio web podría tratar de engañarle para instalar aplicaciones que podrían afectar negativamente su experiencia de navegación.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation><h3>Advertencia de Amenaza Desconocida</h3><p>Este sitio web se ha encontrado en la Base de Datos de Navegación Segura aunque no está todavía clasificado.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation>Malware</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation>Phishing</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation>Software No Deseado</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation>Aplicación Dañina</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation>Binario Malicioso</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation>Amenaza Desconocida</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation>cualquier plataforma definida</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation>todas las plataformas definidas</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation>plataforma desconocida</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation>programa ejecutable</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation>tipo desconocido</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation><h3>Advertencia de Software Malicioso</h3><p>El software que se va a descargar podría ser dañino para su ordenador.</p></translation> </message> @@ -59746,7 +59746,7 @@ <translation>Pulsar para comprobar la URL introducida</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation>Comprobar URL</translation> </message> @@ -59786,12 +59786,12 @@ <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="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation><p>La URL <b>{0}</b> se ha encontrado en la base de datos de Navegación Segura.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation><p>La URL <b>{0}</b> no se ha encontrado en la base de datos de Navegación Segura y se puede considerar segura.</p></translation> </message> @@ -59826,17 +59826,17 @@ <translation>Mostrar Momento de Actualización</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <source>The next automatic threat list update will be done now.</source> <translation>La siguiente actualización automática de lista de amenazas se hará ahora.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation><p>La siguiente actualización automática de lista de amenazas se hará en <b>{0}</b>.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation>Momento de Actualización</translation> </message> @@ -59855,6 +59855,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -59877,22 +59882,22 @@ <translation>El periodo de uso justo no ha expirado todavía. Expirará el {0}.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation>Actualizando listas de amenazas</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation>Borrando listas obsoletas de amenazas</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation>Acutalizando prefijos de hash</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <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>
--- a/i18n/eric6_fr.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_fr.ts Thu Apr 12 19:12:36 2018 +0200 @@ -60373,87 +60373,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -60551,7 +60551,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -60591,12 +60591,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -60626,17 +60626,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -60655,6 +60655,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -60677,22 +60682,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_it.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_it.ts Thu Apr 12 19:12:36 2018 +0200 @@ -59520,87 +59520,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -59698,7 +59698,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -59738,12 +59738,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -59773,17 +59773,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -59802,6 +59802,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -59824,22 +59829,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_pt.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_pt.ts Thu Apr 12 19:12:36 2018 +0200 @@ -60920,87 +60920,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -61098,7 +61098,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -61138,12 +61138,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -61173,17 +61173,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -61202,6 +61202,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -61224,22 +61229,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_ru.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_ru.ts Thu Apr 12 19:12:36 2018 +0200 @@ -59743,87 +59743,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation><h3>Предупреждение о вредоносном ПО</h3><p>Веб-сайт, который Вы собираетесь посетить, может попытаться установить на вашем компьютере опасные программы, чтобы украсть или уничтожить Ваши данные.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation><h3>Предупреждение о фишинг-контенте</h3><p>Веб-сайт, который Вы собираетесь посетить, может попытаться обмануть Вас, обычно через поддельный веб-сайт, например раскрыть пароли или личную информацию.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation><h3>Предупреждение о нежелательном ПО</h3><p>Программное обеспечение, которое вы собираетесь загрузить, может негативно повлиять на работу в браузере или на компьютере..</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation><h3>Потенциально опасное приложение</h3><p>Веб-сайт, который вы собираетесь посетить, может попытаться обмануть вас при установке приложений, что может негативно повлиять на ваш просмотр.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation><h3>Предупреждение о неизвестной угрозе</h3><p>Веб-сайт, который вы собираетесь посетить, был найден в базе Safe Browsing, но не был классифицирован.</p></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation>Вредоносное ПО</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation>Фишинг</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation>Нежелательное ПО</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation>Опасное приложение</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation>Вредный двоичный файл</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation>Неизвестная угроза</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation>любая определенная платформа</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation>все определенные платформы</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation>неизвестная платформа</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation>исполняемая программа</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation>неизвестный тип</translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation><h3>Предупреждение о нежелательном ПО</h3><p>Программное обеспечение, которое вы собираетесь загрузить, может негативно повлиять на работу в браузере или на компьютере..</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation><h3>Потенциально опасное приложение</h3><p>Веб-сайт, который вы собираетесь посетить, может попытаться обмануть вас при установке приложений, что может негативно повлиять на ваш просмотр.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation><h3>Предупреждение о неизвестной угрозе</h3><p>Веб-сайт, который вы собираетесь посетить, был найден в базе Safe Browsing, но не был классифицирован.</p></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation>Вредоносное ПО</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation>Фишинг</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation>Нежелательное ПО</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation>Опасное приложение</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation>Вредный двоичный файл</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation>Неизвестная угроза</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation>любая определенная платформа</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation>все определенные платформы</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation>неизвестная платформа</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation>исполняемая программа</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation>неизвестный тип</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation><h3>Предупреждение о вредном двоичном файле</h3><p>Программное обеспечение, которое Вы собираетесь загрузить, может нанести вред вашему компьютеру.</p></translation> </message> @@ -59926,7 +59926,7 @@ <translation>Проверить введенный URL</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation>Проверить URL</translation> </message> @@ -59966,12 +59966,12 @@ <translation>Вы действительно хотите очистить кэш Safe Browsing? Повторное его заполнение может занять некоторое время.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation><p>URL <b>{0}</b> был найден в базе Safe Browsing.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation><p>URL <b>{0}</b> не найден в базе Safe Browsing и может считаться безопасным.</p></translation> </message> @@ -60006,17 +60006,17 @@ <translation>Показать время обновления</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <source>The next automatic threat list update will be done now.</source> <translation>Сейчас будет выполнено очередное автоматическое обновление списка угроз.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation><p>Следующее автоматическое обновление списка угроз будет выполнено <b>{0}</b>.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation>Время обновления</translation> </message> @@ -60035,6 +60035,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -60057,22 +60062,22 @@ <translation>Не завершен период ожидания для "честного" использования сайта. Завершение периода наступит {0}.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation>Обновление списков угроз</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation>Удаление устаревших списков угроз</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation>Обновление хеш-префиксов</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation>Контрольная сумма локального кэша не соответствует серверу. Подумайте об очистке кэша. Обновление списка угроз было прервано.</translation> </message>
--- a/i18n/eric6_tr.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_tr.ts Thu Apr 12 19:12:36 2018 +0200 @@ -60313,87 +60313,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -60491,7 +60491,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -60531,12 +60531,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -60566,17 +60566,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -60595,6 +60595,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -60617,22 +60622,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_zh_CN.ts Wed Apr 11 19:57:23 2018 +0200 +++ b/i18n/eric6_zh_CN.ts Thu Apr 12 19:12:36 2018 +0200 @@ -60461,87 +60461,87 @@ <context> <name>SafeBrowsingAPI</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="376"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="389"/> <source><h3>Malware Warning</h3><p>The web site you are about to visit may try to install harmful programs on your computer in order to steal or destroy your data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="383"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="396"/> <source><h3>Phishing Warning</h3><p>The web site you are about to visit may try to trick you into doing something dangerous online, such as revealing passwords or personal information, usually through a fake website.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="391"/> - <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="397"/> - <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="411"/> - <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="431"/> - <source>Malware</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="434"/> - <source>Phishing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="437"/> - <source>Unwanted Software</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="440"/> - <source>Harmful Application</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="443"/> - <source>Malicious Binary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="446"/> - <source>Unknown Threat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="473"/> - <source>any defined platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="476"/> - <source>all defined platforms</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="479"/> - <source>unknown platform</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="495"/> - <source>executable program</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="498"/> - <source>unknown type</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="404"/> + <source><h3>Unwanted Software Warning</h3><p>The software you are about to download may negatively affect your browsing or computing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="410"/> + <source><h3>Potentially Harmful Application</h3><p>The web site you are about to visit may try to trick you into installing applications, that may negatively affect your browsing experience.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="424"/> + <source><h3>Unknown Threat Warning</h3><p>The web site you are about to visit was found in the Safe Browsing Database but was not classified yet.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="444"/> + <source>Malware</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="447"/> + <source>Phishing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="450"/> + <source>Unwanted Software</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="453"/> + <source>Harmful Application</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="456"/> + <source>Malicious Binary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="459"/> + <source>Unknown Threat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="530"/> + <source>any defined platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="533"/> + <source>all defined platforms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="536"/> + <source>unknown platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="490"/> + <source>executable program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="493"/> + <source>unknown type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py" line="417"/> <source><h3>Malicious Binary Warning</h3><p>The software you are about to download may be harmful to your computer.</p></source> <translation type="unfinished"></translation> </message> @@ -60639,7 +60639,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source>Check URL</source> <translation type="unfinished"></translation> </message> @@ -60679,12 +60679,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="301"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="307"/> <source><p>The URL <b>{0}</b> was found in the Safe Browsing Database.</p>{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="309"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="315"/> <source><p>The URL <b>{0}</b> was not found in the Safe Browsing Database and may be considered safe.</p></source> <translation type="unfinished"></translation> </message> @@ -60714,17 +60714,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="333"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> <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="336"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="343"/> <source><p>The next automatic threat list update will be done at <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="340"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="347"/> <source>Update Time</source> <translation type="unfinished"></translation> </message> @@ -60743,6 +60743,11 @@ <source>Manage Local Cache (Update API only)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="299"/> + <source><p>The Google Safe Browsing Server reported an error.</p><p>{0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -60765,22 +60770,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="267"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="270"/> <source>Updating threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="284"/> <source>Deleting obsolete threat lists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="300"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="306"/> <source>Updating hash prefixes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="326"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="332"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation type="unfinished"></translation> </message>
