--- a/eric6/i18n/eric6_ru.ts Sun May 03 16:24:39 2020 +0200
+++ b/eric6/i18n/eric6_ru.ts Sun May 03 16:26:31 2020 +0200
@@ -46163,50 +46163,55 @@
<context>
<name>NetworkManager</name>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="194"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="201"/>
<source>SSL Certificate Error</source>
<translation>Ошибка сертификата SSL</translation>
</message>
<message>
<location filename="../WebBrowser/Network/NetworkManager.py" line="195"/>
<source><b>{0}</b><p>The page you are trying to access has errors in the SSL certificate.</p><ul><li>{1}</li></ul><p>Would you like to make an exception?</p></source>
- <translation><b>{0}</b><p>Страница, к которой вы пытаетесь получить доступ, имет ошибки сертификата SSL.</p><ul><li>{1}</li></ul><p>Хотите сделать исключение?</p></translation>
- </message>
- <message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="205"/>
+ <translation type="obsolete"><b>{0}</b><p>Страница, к которой вы пытаетесь получить доступ, имет ошибки сертификата SSL.</p><ul><li>{1}</li></ul><p>Хотите сделать исключение?</p></translation>
+ </message>
+ <message>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="212"/>
<source>&Permanent accept</source>
<translation>Принимать &всегда</translation>
</message>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="207"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="214"/>
<source>&Temporary accept</source>
<translation>Принимать вр&еменно</translation>
</message>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="209"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="216"/>
<source>&Reject</source>
<translation>&Отвергать</translation>
</message>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="243"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="284"/>
<source><b>Enter username and password for '{0}', realm '{1}'</b></source>
<translation><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation>
</message>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="247"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="288"/>
<source><b>Enter username and password for '{0}'</b></source>
<translation><b>Введите имя пользователя и пароль для '{0}'</b></translation>
</message>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="295"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="336"/>
<source>Authentication required</source>
<translation>Требуется аутентификация</translation>
</message>
<message>
- <location filename="../WebBrowser/Network/NetworkManager.py" line="296"/>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="337"/>
<source>Authentication is required to access:</source>
<translation>Для доступа требуется аутентификация:</translation>
</message>
+ <message>
+ <location filename="../WebBrowser/Network/NetworkManager.py" line="202"/>
+ <source><b>{0}</b><p>The host <b>{1}</b> you are trying to access has errors in the SSL certificate.</p><ul><li>{2}</li></ul><p>Would you like to make an exception?</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>NetworkPage</name>
@@ -49591,17 +49596,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1640"/>
+ <location filename="../Preferences/__init__.py" line="1644"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1668"/>
+ <location filename="../Preferences/__init__.py" line="1672"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1668"/>
+ <location filename="../Preferences/__init__.py" line="1672"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation>
</message>
@@ -60781,6 +60786,21 @@
<source><b>Configure security settings</b></source>
<translation><b>Настройка безопасности</b></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="96"/>
+ <source>Certificate Errors</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="102"/>
+ <source>Select to always reject web pages with certificate issues</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/SecurityPage.ui" line="105"/>
+ <source>Always reject URLs with certificate errors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SendRefererWhitelistDialog</name>
@@ -62822,60 +62842,65 @@
<translation><b>Сайт {0}</b></translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="62"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="69"/>
<source>Your connection to this site is <b>secure</b>.</source>
<translation>Ваше соединение с этим сайтом <b>защищено</b>.</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="67"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="74"/>
<source>Your connection to this site is <b>not secure</b>.</source>
<translation>Ваше соединение с этим сайтом <b>не защищено</b>.</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="82"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="89"/>
<source>This is your <b>{0}.</b> visit of this site.</source>
<translation>Это ваше <b>{0}.</b> посещение этого сайта.</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="88"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="95"/>
<source>You have <b>never</b> visited this site before.</source>
<translation>Вы <b>никогда</b> не посещали этот сайт раньше.</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="97"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="104"/>
<source>first</source>
<translation>первое</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="99"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="106"/>
<source>second</source>
<translation>второе</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="101"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="108"/>
<source>third</source>
<translation>третье</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="102"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="109"/>
<source>This is your <b>{0}</b> visit of this site.</source>
<translation>Это ваше <b>{0}</b> посещение этого сайта.</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="123"/>
- <source>Register as <b>{0}</b> links handler.</source>
- <translation>Регистрация как <b>{0}</b> обработчик ссылок.</translation>
- </message>
- <message>
<location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="130"/>
+ <source>Register as <b>{0}</b> links handler.</source>
+ <translation>Регистрация как <b>{0}</b> обработчик ссылок.</translation>
+ </message>
+ <message>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="137"/>
<source>Register</source>
<translation>Регистрация</translation>
</message>
<message>
- <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="147"/>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="154"/>
<source>More...</source>
<translation>Еще...</translation>
</message>
+ <message>
+ <location filename="../WebBrowser/SiteInfo/SiteInfoWidget.py" line="63"/>
+ <source>Your connection to this site <b>may not be secure</b>.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SnapWidget</name>
@@ -82702,47 +82727,47 @@
<translation>Минимальный размер логического шрифта:</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="324"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="402"/>
<source>Images</source>
<translation>Изображения</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="330"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="408"/>
<source>Select to load images</source>
<translation>Разрешить загрузку изображений</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="333"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="411"/>
<source>Load images</source>
<translation>Загружать изображения</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="343"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="421"/>
<source>Style Sheet</source>
<translation>Страница стилей</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="349"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="427"/>
<source>User Style Sheet:</source>
<translation>Таблица стилей пользователя:</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="365"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="443"/>
<source>Enter the file name of a user style sheet</source>
<translation>Задайте имя файла таблицы стилей пользователя</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="375"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="453"/>
<source>Tabs</source>
<translation>Вкладки</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="381"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="459"/>
<source>Select to issue a warning, if multiple tabs are about to be closed</source>
<translation>Разрешить предупреждения, если возможно закрытие нескольких вкладок</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="384"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="462"/>
<source>Warn, if multiple tabs are about to be closed</source>
<translation>Предупреждать, если возможно закрытие нескольких вкладок</translation>
</message>
@@ -82762,37 +82787,37 @@
<translation>Выбор пиктографического шрифта</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="426"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="504"/>
<source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source>
<translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="433"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="511"/>
<source>Toolbars</source>
<translation>Панели инструментов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="439"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="517"/>
<source>Select to show toolbars</source>
<translation>Разрешить отображение панелей инструментов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="442"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="520"/>
<source>Show Toolbars</source>
<translation>Показывать панели инструментов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="394"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="472"/>
<source>Scrollbars</source>
<translation>Полосы прокрутки</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="400"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="478"/>
<source>Select to show scrollbars. Note: Scrolling is possible even without them.</source>
<translation>Разрешить показывать полосу прокрутки. Примечание: Прокрутка возможна даже без них.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="403"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="481"/>
<source>Show Scrollbars</source>
<translation>Показывать полосы прокрутки</translation>
</message>
@@ -82804,13 +82829,53 @@
<message>
<location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
<source>Background color of secure URLs:</source>
- <translation>Цвет фона защищенных URL:</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="298"/>
+ <translation type="obsolete">Цвет фона защищенных URL:</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="304"/>
<source>Select the background color for secure URLs.</source>
<translation>Выберите цвет фона безопасных URL-адресов.</translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="285"/>
+ <source>URL Entry Background</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="291"/>
+ <source>Secure URLs:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="327"/>
+ <source>Insecure URLs:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="340"/>
+ <source>Select the background color for insecure URLs.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="350"/>
+ <source>Malicious URLs:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="363"/>
+ <source>Select the background color for malicious URLs.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="373"/>
+ <source>Private Mode:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserAppearancePage.ui" line="386"/>
+ <source>Select the background color for URLs in private mode.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>WebBrowserClearPrivateDataDialog</name>
