--- a/i18n/eric6_ru.ts Tue Aug 08 10:53:10 2017 +0200 +++ b/i18n/eric6_ru.ts Tue Aug 08 17:20:28 2017 +0200 @@ -40273,27 +40273,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1590"/> + <location filename="../Preferences/__init__.py" line="1592"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1618"/> + <location filename="../Preferences/__init__.py" line="1620"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1618"/> + <location filename="../Preferences/__init__.py" line="1620"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1720"/> + <location filename="../Preferences/__init__.py" line="1722"/> <source>Select Python{0} Interpreter</source> <translation>Задайте интерпретатор Python{0}</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1720"/> + <location filename="../Preferences/__init__.py" line="1722"/> <source>Select the Python{0} interpreter to be used:</source> <translation>Задайте интерпретатор Python{0}:</translation> </message> @@ -50157,155 +50157,200 @@ <context> <name>SafeBrowsingDialog</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/> <source>Safe Browsing Management</source> <translation>Управление Safe Browsing</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="23"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="73"/> <source>Select to enable the Google safe browsing support</source> <translation>Разрешить поддержку безопасного просмотра Google</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="26"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="76"/> <source>Enable Google Safe Browsing</source> <translation>Служба Google Safe Browsing</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="48"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="102"/> <source>Select to check against the current platform only</source> <translation>Разрешить проверку только для текущей платформы</translation> </message> <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/> <source>Adjust to current platform</source> - <translation>Уточнить текущую платформу</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="58"/> + <translation type="obsolete">Уточнить текущую платформу</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="122"/> <source>API Key:</source> <translation>API ключ:</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="65"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="95"/> <source>Enter the Google Safe Browsing API key</source> <translation>Введите API ключ Safe Browsing Google</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="72"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="85"/> <source>Press to get some help about obtaining the API key</source> <translation>Справка о получении API ключа</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="83"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="86"/> <source>Google Safe Browsing API Help</source> <translation>Справка Google Safe Browsing API</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="100"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="147"/> <source>Press to save the current configuration settings</source> <translation>Сохранить текущие параметры конфигурации</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="103"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="150"/> <source>Save Configuration</source> <translation>Сохранить конфигурацию</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="125"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="179"/> <source>Manage Local Cache</source> <translation>Управление локальным кэшем</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="133"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="187"/> <source>Press to update the local cache database</source> <translation>Обновить базу данных локального кэша</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="136"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="190"/> <source>Update Cache</source> <translation>Обновить кэш</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="143"/> - <source>Press to clear the local cache database</source> - <translation>Очистить базу данных локального кэша</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="146"/> - <source>Clear Cache</source> - <translation>Очистить кэш</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="168"/> - <source>%v/%m</source> - <translation>%v/%m</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="178"/> - <source>URL Check</source> - <translation>Проверка URL</translation> - </message> - <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="184"/> - <source>URL:</source> - <translation>URL:</translation> - </message> - <message> <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="197"/> + <source>Press to clear the local cache database</source> + <translation>Очистить базу данных локального кэша</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="200"/> + <source>Clear Cache</source> + <translation>Очистить кэш</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="239"/> + <source>%v/%m</source> + <translation>%v/%m</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="256"/> + <source>URL Check</source> + <translation>Проверка URL</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="262"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="275"/> <source>Press to check the entered URL</source> <translation>Проверить введенный URL</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="289"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/> <source>Check URL</source> <translation>Проверить URL</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="156"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="164"/> <source>The dialog contains unsaved changes.</source> <translation>Диалог содержит несохраненные изменения.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/> <source>Update Safe Browsing Cache</source> <translation>Обновить кэш Safe Browsing</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="179"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="189"/> <source>Updating the Safe Browsing cache might be a lengthy operation. Please be patient!</source> <translation>Обновление кэша Safe Browsing может занять некоторое время. Пожалуйста, подождите!</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="191"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="201"/> <source><p>Updating the Safe Browsing cache failed.</p><p>Reason: {0}</p></source> <translation><p>Не удалось обновить кэш Safe Browsing.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="197"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="207"/> <source><p>Updating the Safe Browsing cache failed.</p></source> <translation><p>Не удалось обновить кэш Safe Browsing.</p></translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/> <source>Clear Safe Browsing Cache</source> <translation>Очистить кэш Safe Browsing</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="208"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="218"/> <source>Do you really want to clear the Safe Browsing cache? Re-populating it might take some time.</source> <translation>Вы действительно хотите очистить кэш Safe Browsing? Повторное его заполнение может занять некоторое время.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="281"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="292"/> <source><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="289"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="300"/> <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> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="51"/> + <source><h2>Google Safe Browsing</h2></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="105"/> + <source>Adjust threat lists to current platform</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="112"/> + <source>Select to update the threat lists automatically when fair use period has expired</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="115"/> + <source>Update threat lists automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="214"/> + <source>Press to see, when the next threat list update will be done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.ui" line="217"/> + <source>Show Update Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="324"/> + <source>The next automatic threat list update will be done now.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingDialog.py" line="327"/> + <source><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="331"/> + <source>Update Time</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SafeBrowsingLabel</name> @@ -50318,35 +50363,50 @@ <context> <name>SafeBrowsingManager</name> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="135"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="207"/> <source>Safe Browsing is disabled.</source> <translation>Сервис Safe Browsing отключен.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="139"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="211"/> <source>The fair use wait period has not expired yet.Expiration will be at {0}.</source> <translation>Не завершен период ожидания для "честного" использования сайта. Завершение периода наступит {0}.</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="154"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="231"/> <source>Updating threat lists</source> <translation>Обновление списков угроз</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="168"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="245"/> <source>Deleting obsolete threat lists</source> <translation>Удаление устаревших списков угроз</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="187"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="264"/> <source>Updating hash prefixes</source> <translation>Обновление хеш-префиксов</translation> </message> <message> - <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="213"/> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="290"/> <source>Local cache checksum does not match the server. Consider cleaning the cache. Threat update has been aborted.</source> <translation>Контрольная сумма локального кэша не соответствует серверу. Подумайте об очистке кэша. Обновление списка угроз было прервано.</translation> </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="177"/> + <source>Updating threat lists...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="180"/> + <source>Updating threat lists done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/SafeBrowsing/SafeBrowsingManager.py" line="183"/> + <source>Updating threat lists failed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SearchReplaceWidget</name> @@ -73734,12 +73794,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="350"/> + <location filename="../eric6.py" line="352"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../eric6.py" line="355"/> + <location filename="../eric6.py" line="357"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message>