--- a/i18n/eric6_ru.ts Wed Jan 24 12:37:53 2018 +0100 +++ b/i18n/eric6_ru.ts Wed Jan 24 18:45:50 2018 +0100 @@ -8168,12 +8168,12 @@ <context> <name>DownloadItem</name> <message> - <location filename="../WebBrowser/Download/DownloadItem.ui" line="38"/> + <location filename="../WebBrowser/Download/DownloadItem.ui" line="41"/> <source>Icon</source> <translation>Иконка</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.ui" line="66"/> + <location filename="../WebBrowser/Download/DownloadItem.ui" line="72"/> <source>Filename</source> <translation>Имя файла</translation> </message> @@ -8183,27 +8183,27 @@ <translation>Повторить закачку</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.ui" line="103"/> + <location filename="../WebBrowser/Download/DownloadItem.ui" line="122"/> <source>Press to cancel the download</source> <translation>Отменить закачку</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.ui" line="113"/> + <location filename="../WebBrowser/Download/DownloadItem.ui" line="132"/> <source>Press to open the downloaded file</source> <translation>Открыть скачанный файл</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="261"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="266"/> <source>Download canceled: {0}</source> <translation>Загрузка прервана: {0}</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="207"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="212"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="290"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="295"/> <source>Download directory ({0}) couldn't be created.</source> <translation>Невозможно создать директорию ({0}) для загрузки.</translation> </message> @@ -8223,27 +8223,27 @@ <translation>Сетевая ошибка: {0}</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="465"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="485"/> <source>?</source> <translation>?</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="476"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="496"/> <source>{0} of {1} - Stopped</source> <translation>{0} из {1} - остановлено</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="192"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="197"/> <source>VirusTotal scan scheduled: {0}</source> <translation>Сканирование VirusTotal запланировано: {0}</translation> </message> <message> - <location filename="../Helpviewer/Download/DownloadItem.ui" line="113"/> + <location filename="../WebBrowser/Download/DownloadItem.ui" line="109"/> <source>Press to pause the download</source> <translation>Приостановить закачку</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="464"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="484"/> <source>{0} of {1} ({2}/sec) {3}</source> <translation>{0} из {1} ({2}/сек) @@ -8259,32 +8259,32 @@ MD5: {2}</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="473"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="493"/> <source>{0} downloaded</source> <translation>{0} загружено</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="218"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="223"/> <source>Web Archive (*.mhtml *.mht)</source> <translation>Web архив (*.mhtml *.mht)</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="219"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="224"/> <source>HTML File (*.html *.htm)</source> <translation>Файлы HTML (*.html *.htm)</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="220"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="225"/> <source>HTML File with all resources (*.html *.htm)</source> <translation>Файлы HTML со всеми ресурсами (*.html *.htm)</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.py" line="230"/> + <location filename="../WebBrowser/Download/DownloadItem.py" line="235"/> <source>Save Web Page</source> <translation>Сохранить Web страницу</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadItem.ui" line="47"/> + <location filename="../WebBrowser/Download/DownloadItem.ui" line="53"/> <source>Date and Time</source> <translation>Дата и время</translation> </message> @@ -8292,7 +8292,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="395"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="405"/> <source>Downloads</source> <translation>Загрузки</translation> </message> @@ -8307,7 +8307,7 @@ <translation>0 элементов</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/Download/DownloadManager.py" line="384"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="394"/> <source>%n Download(s)</source> <translation> <numerusform>%n загружен</numerusform> @@ -8316,7 +8316,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/Download/DownloadManager.py" line="153"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="152"/> <source>There are %n downloads in progress. Do you want to quit anyway?</source> <translation> @@ -8374,7 +8374,7 @@ <translation>Удалить из списка</translation> </message> <message numerus="yes"> - <location filename="../WebBrowser/Download/DownloadManager.py" line="392"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="402"/> <source>Downloading %n file(s)</source> <translation> <numerusform>Загружается %n файл</numerusform> @@ -8383,12 +8383,12 @@ </translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="182"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="181"/> <source>Suspicuous URL detected</source> <translation>Обнаружен подозрительный URL</translation> </message> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="182"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="181"/> <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> @@ -82485,7 +82485,7 @@ <context> <name>WebBrowserWindow</name> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3605"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3607"/> <source>eric6 Web Browser</source> <translation>Eric6 Web браузер</translation> </message> @@ -84169,12 +84169,12 @@ <translation>Проверить текущий сервер</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4664"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4666"/> <source>IP Address Report</source> <translation>Отчет IP адреса</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4674"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4676"/> <source>Domain Report</source> <translation>Отчет домена</translation> </message> @@ -84199,84 +84199,84 @@ <translation>Сохраненные вкладки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3422"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3424"/> <source>Could not find an associated content.</source> <translation>Невозможно найти соответствующее содержание.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3525"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3527"/> <source>Updating search index</source> <translation>Обновление поискового индекса</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3595"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3597"/> <source>Looking for Documentation...</source> <translation>Идёт поиск помощи...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3630"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3632"/> <source>Unfiltered</source> <translation>Unfiltered</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="3649"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="3651"/> <source>Help Engine</source> <translation>Движок для системы справки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4202"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4204"/> <source>ISO</source> <translation>ISO</translation> </message> <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4208"/> + <source>Windows</source> + <translation>Windows</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4210"/> + <source>ISCII</source> + <translation>ISCII</translation> + </message> + <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4206"/> - <source>Windows</source> - <translation>Windows</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4208"/> - <source>ISCII</source> - <translation>ISCII</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4204"/> <source>Unicode</source> <translation>Юникод</translation> </message> <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4214"/> + <source>Other</source> + <translation>Другое</translation> + </message> + <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4212"/> - <source>Other</source> - <translation>Другое</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4210"/> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4629"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4631"/> <source>VirusTotal Scan</source> <translation>Проверка VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4629"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4631"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>Невозможно запланировать проверку VirusTotal.<p> <p>Причина: {0}</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4655"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4657"/> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation>Введите действительный адрес IPv4 в четырехкомпонентой нотации с точками:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4664"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4666"/> <source>The given IP address is not in dotted quad notation.</source> <translation>Данный IP адрес приведен не в четырехкомпонентой нотации с точками.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4674"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4676"/> <source>Enter a valid domain name:</source> <translation>Введите действительное имя домена:</translation> </message> @@ -84388,27 +84388,27 @@ <translation>Показать всю историю...</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4237"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4239"/> <source>Menu Bar</source> <translation>Строка меню</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4242"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4244"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4247"/> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4249"/> <source>Status Bar</source> <translation>Строка статуса</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4261"/> - <source>&Show all</source> - <translation>Показать &всё</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4263"/> + <source>&Show all</source> + <translation>Показать &всё</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4265"/> <source>&Hide all</source> <translation>Ск&рыть всё</translation> </message>