--- a/i18n/eric5_ru.ts Tue Jan 17 20:21:27 2012 +0100 +++ b/i18n/eric5_ru.ts Wed Jan 18 19:59:42 2012 +0100 @@ -1900,67 +1900,67 @@ <translation>Точки останова</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="171"/> + <location filename="Debugger/BreakPointViewer.py" line="170"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="142"/> + <location filename="Debugger/BreakPointViewer.py" line="141"/> <source>Edit...</source> <translation>Правка...</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="144"/> + <location filename="Debugger/BreakPointViewer.py" line="143"/> <source>Enable</source> <translation>Разрешить</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="175"/> + <location filename="Debugger/BreakPointViewer.py" line="174"/> <source>Enable all</source> <translation>Разрешить все</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="147"/> + <location filename="Debugger/BreakPointViewer.py" line="146"/> <source>Disable</source> <translation>Запретить</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="179"/> + <location filename="Debugger/BreakPointViewer.py" line="178"/> <source>Disable all</source> <translation>Запретить все</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="150"/> + <location filename="Debugger/BreakPointViewer.py" line="149"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="183"/> + <location filename="Debugger/BreakPointViewer.py" line="182"/> <source>Delete all</source> <translation>Удалить все</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="153"/> + <location filename="Debugger/BreakPointViewer.py" line="152"/> <source>Goto</source> <translation>Перейти</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="173"/> + <location filename="Debugger/BreakPointViewer.py" line="172"/> <source>Enable selected</source> <translation>Разрешить выбранные</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="177"/> + <location filename="Debugger/BreakPointViewer.py" line="176"/> <source>Disable selected</source> <translation>Запретить выбранные</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="181"/> + <location filename="Debugger/BreakPointViewer.py" line="180"/> <source>Delete selected</source> <translation>Удалить выбранные</translation> </message> <message> - <location filename="Debugger/BreakPointViewer.py" line="185"/> + <location filename="Debugger/BreakPointViewer.py" line="184"/> <source>Configure...</source> <translation>Настроить...</translation> </message> @@ -1981,12 +1981,12 @@ <p>Файлы перевода (<tt>.ts</tt>, отмеченные пиктограммой Лингвиста) могут быть отредактированы с помощью Лингвиста</p></translation> </message> <message> - <location filename="UI/Browser.py" line="203"/> + <location filename="UI/Browser.py" line="202"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="UI/Browser.py" line="181"/> + <location filename="UI/Browser.py" line="180"/> <source>Run unittest...</source> <translation>Запустить unittest...</translation> </message> @@ -1996,62 +1996,62 @@ <translation>Просмотрщик файлов</translation> </message> <message> - <location filename="UI/Browser.py" line="259"/> + <location filename="UI/Browser.py" line="258"/> <source>New toplevel directory...</source> <translation>Новый каталог верхнего уровня...</translation> </message> <message> - <location filename="UI/Browser.py" line="218"/> + <location filename="UI/Browser.py" line="217"/> <source>Remove from toplevel</source> <translation>Удалить из верхнего уровня</translation> </message> <message> - <location filename="UI/Browser.py" line="215"/> + <location filename="UI/Browser.py" line="214"/> <source>Add as toplevel directory</source> <translation>Добавить как каталог верхнего уровня</translation> </message> <message> - <location filename="UI/Browser.py" line="459"/> + <location filename="UI/Browser.py" line="458"/> <source>New toplevel directory</source> <translation>Новый каталог верхнего уровня</translation> </message> <message> - <location filename="UI/Browser.py" line="226"/> + <location filename="UI/Browser.py" line="225"/> <source>Find in this directory</source> <translation>Найти в этом каталоге</translation> </message> <message> - <location filename="UI/Browser.py" line="229"/> + <location filename="UI/Browser.py" line="228"/> <source>Find&&Replace in this directory</source> <translation>Найти и изменить в этом каталоге</translation> </message> <message> - <location filename="UI/Browser.py" line="264"/> + <location filename="UI/Browser.py" line="263"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="UI/Browser.py" line="191"/> + <location filename="UI/Browser.py" line="190"/> <source>Open in Icon Editor</source> <translation>Открыть в редакторе иконок</translation> </message> <message> - <location filename="UI/Browser.py" line="232"/> + <location filename="UI/Browser.py" line="231"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="UI/Browser.py" line="222"/> + <location filename="UI/Browser.py" line="221"/> <source>Refresh directory</source> <translation>Обновить каталог</translation> </message> <message> - <location filename="UI/Browser.py" line="241"/> + <location filename="UI/Browser.py" line="240"/> <source>Goto</source> <translation type="unfinished">Перейти</translation> </message> <message> - <location filename="UI/Browser.py" line="343"/> + <location filename="UI/Browser.py" line="342"/> <source>Line {0}</source> <translation type="unfinished"></translation> </message> @@ -2344,37 +2344,37 @@ <context> <name>CodeMetricsDialog</name> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="193"/> + <location filename="DataViews/CodeMetricsDialog.py" line="192"/> <source>non-commentary lines</source> <translation>строки не-комментарии</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="191"/> - <source>empty lines</source> - <translation>пустые строки</translation> - </message> - <message> <location filename="DataViews/CodeMetricsDialog.py" line="190"/> - <source>comments</source> - <translation>комментарии</translation> + <source>empty lines</source> + <translation>пустые строки</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.py" line="189"/> - <source>bytes</source> - <translation>байты</translation> + <source>comments</source> + <translation>комментарии</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.py" line="188"/> - <source>lines</source> - <translation>строки</translation> + <source>bytes</source> + <translation>байты</translation> </message> <message> <location filename="DataViews/CodeMetricsDialog.py" line="187"/> + <source>lines</source> + <translation>строки</translation> + </message> + <message> + <location filename="DataViews/CodeMetricsDialog.py" line="186"/> <source>files</source> <translation>файлы</translation> </message> <message> - <location filename="DataViews/CodeMetricsDialog.py" line="195"/> + <location filename="DataViews/CodeMetricsDialog.py" line="194"/> <source>documentation lines</source> <translation>строки документации</translation> </message> @@ -12978,97 +12978,97 @@ <context> <name>HelpBrowser</name> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="622"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="655"/> <source><p>Could not start a viewer for file <b>{0}</b>.</p></source> <translation><p>Невозможно запустить просмотрщик для файла <b>{0}</b>.</p></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="790"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="823"/> <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Открыть ссылку в новой закладке<byte value="x9"/>Shift+Левая кнопка мыши</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="585"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="618"/> <source><p>The file <b>{0}</b> does not exist.</p></source> <translation><p>Файл <b>{0}</b> не существует.</p></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="403"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="436"/> <source><b>Help Window</b><p>This window displays the selected help information.</p></source> <translation><b>Окно помощи</b><p>В этом окне отображается имеющаяся помощь.</p></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="869"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="902"/> <source>Web Inspector...</source> <translation>WEB проводник...</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1393"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1426"/> <source>Error loading page: {0}</source> <translation>Ошибка при загрузке страницы: {0}</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1402"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1435"/> <source>When connecting to: {0}.</source> <translation>При соединении с {0}.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1402"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1435"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Проверьте адрес на ошибки типа <b>ww</b>.example.org вместо <b>www</b>.example.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1402"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1435"/> <source>If the address is correct, try checking the network connection.</source> <translation>Если адрес правильный, проверьте сетевое соединение.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1402"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1435"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Если ваш компьютер или локальная сеть находятся за firewall или proxy, убедитесь что браузеру разрешено подсоединяться к сети.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="605"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="638"/> <source><p>Could not start an application for URL <b>{0}</b>.</p></source> <translation><p>Невозможно запустить приложение для URL <b>{0}</b>.</p></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="833"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="866"/> <source>Bookmark this Page</source> <translation>Создать закладку для этой страницы</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="794"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="827"/> <source>Save Lin&k</source> <translation>Сохранить &ссылку</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="795"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="828"/> <source>Bookmark this Link</source> <translation>Сохранить ссылку</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="798"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="831"/> <source>Copy Link to Clipboard</source> <translation>Скопировать ссылку</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="808"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="841"/> <source>Open Image in New Tab</source> <translation>Открыть изображение в новой закладке</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="812"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="845"/> <source>Save Image</source> <translation>Сохранить изображение</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="813"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="846"/> <source>Copy Image to Clipboard</source> <translation>Скопировать изображение</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="814"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="847"/> <source>Copy Image Location to Clipboard</source> <translation>Скопировать адрес изображения</translation> </message> @@ -13078,102 +13078,102 @@ <translation type="obsolete">Просмотрщик Web</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="818"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="851"/> <source>Block Image</source> <translation>Заблокировать изображение</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="847"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="880"/> <source>Search with...</source> <translation>Искать с...</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1442"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1475"/> <source>Web Database Quota</source> <translation>Квота Web базы данных</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1442"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1475"/> <source><p>The database quota of <strong>{0}</strong> has been exceeded while accessing database <strong>{1}</strong>.</p><p>Shall it be changed?</p></source> <translation><p>Квота Web базы данных <strong>{0}</strong> была превышена при доступе к базе <strong>{1}</strong>.</p><p>Изменить квоту?</p></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1450"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1483"/> <source>New Web Database Quota</source> <translation>Новая квота Web базы данных</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1470"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1503"/> <source>bytes</source> <translation>байт</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1473"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1506"/> <source>kB</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1476"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1509"/> <source>MB</source> <translation></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1450"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1483"/> <source>Enter the new quota in MB (current = {0}, used = {1}; step size = 5 MB):</source> <translation>Введите новую квоту в MB (текущая = {0}, использовано = {1}; шаг изменения = 5 MB):</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="864"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="897"/> <source>Add to web search toolbar</source> <translation>Добавить к панели инструментов Web поиска</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="984"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1017"/> <source>Method not supported</source> <translation>Метод не поддерживается</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="984"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1017"/> <source>{0} method is not supported.</source> <translation>{0} метод не поддерживается.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1026"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1059"/> <source>Search engine</source> <translation>Поисковик</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1026"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1059"/> <source>Choose the desired search engine</source> <translation>Выберите поисковик</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1043"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1076"/> <source>Engine name</source> <translation>Имя поисковика</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1043"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1076"/> <source>Enter a name for the engine</source> <translation>Введите имя поисковика</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="1402"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="1435"/> <source>If your cache policy is set to offline browsing,only pages in the local cache are available.</source> <translation>Если режим кэша установлен в offline, то доступны только страницы из локального кзша.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="801"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="834"/> <source>Scan Link with VirusTotal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="822"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="855"/> <source>Scan Image with VirusTotal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="622"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="655"/> <source>eric5 Web Browser</source> <translation type="unfinished">WEB просмотрщик встроенный в Eric5</translation> </message> @@ -13574,27 +13574,27 @@ <translation><p>Печать невозможна из-за ошибки в PyQt4. Пожалуйста установите обновление.</p></translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="591"/> + <location filename="Helpviewer/HelpTabWidget.py" line="595"/> <source>Loading...</source> <translation>Загружаю...</translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="608"/> + <location filename="Helpviewer/HelpTabWidget.py" line="612"/> <source>Finished loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="610"/> + <location filename="Helpviewer/HelpTabWidget.py" line="614"/> <source>Failed to load</source> <translation>Загрука не удалась</translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="646"/> + <location filename="Helpviewer/HelpTabWidget.py" line="650"/> <source>Are you sure you want to close the window?</source> <translation>Вы действительно хотите закрыть это окно?</translation> </message> <message numerus="yes"> - <location filename="Helpviewer/HelpTabWidget.py" line="646"/> + <location filename="Helpviewer/HelpTabWidget.py" line="650"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -13607,17 +13607,17 @@ </translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="653"/> + <location filename="Helpviewer/HelpTabWidget.py" line="657"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="656"/> + <location filename="Helpviewer/HelpTabWidget.py" line="660"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="Helpviewer/HelpTabWidget.py" line="662"/> <source>C&lose Current Tab</source> <translation>&Закрыть текущую закладку</translation> </message> @@ -14248,52 +14248,52 @@ <context> <name>HelpWebPage</name> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="260"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="261"/> <source>Error loading page: {0}</source> <translation>Ошибка при загрузке страницы: {0}</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="269"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="270"/> <source>When connecting to: {0}.</source> <translation>При соединении с {0}.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="269"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="270"/> <source>Check the address for errors such as <b>ww</b>.example.org instead of <b>www</b>.example.org</source> <translation>Проверьте адрес на ошибки типа <b>ww</b>.example.org вместо <b>www</b>.example.org</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="269"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="270"/> <source>If the address is correct, try checking the network connection.</source> <translation>Если адрес правильный, проверьте сетевое соединение.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="269"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="270"/> <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source> <translation>Если ваш компьютер или локальная сеть находятся за firewall или proxy, убедитесь что браузеру разрешено подсоединяться к сети.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="269"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="270"/> <source>If your cache policy is set to offline browsing,only pages in the local cache are available.</source> <translation>Если режим кэша установлен в offline, то доступны только страницы из локального кзша.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="367"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="373"/> <source>SSL Certificate Info</source> <translation>SLL сертификат</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="367"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="373"/> <source>There is no SSL Certificate Info available.</source> <translation>SLL сертификат отсутствует.</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="196"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="197"/> <source>Resending POST request</source> <translation>Повторяю POST запрос</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="196"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="197"/> <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source> <translation>Для того чтобы показать страницу, необходимо повторить запрос, что может вызвать неожиданное поведение сервера, например, он может дважды сделать одно и то же действие. Продолжить не смотря на это?</translation> </message> @@ -15233,12 +15233,12 @@ <message> <location filename="Helpviewer/HelpWindow.py" line="1127"/> <source>Show Network Monitor</source> - <translation>Показать монитор сети</translation> + <translation type="obsolete">Показать монитор сети</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="1127"/> <source>Show &Network Monitor</source> - <translation>Показать монитор &сети</translation> + <translation type="obsolete">Показать монитор &сети</translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="1131"/> @@ -15248,7 +15248,7 @@ <message> <location filename="Helpviewer/HelpWindow.py" line="1132"/> <source><b>Show Network Monitor</b><p>Shows the network monitor dialog.</p></source> - <translation><b>Показать монитор сети</b><p>Показать диалог монитора сети.</p></translation> + <translation type="obsolete"><b>Показать монитор сети</b><p>Показать диалог монитора сети.</p></translation> </message> <message> <location filename="Helpviewer/HelpWindow.py" line="1284"/> @@ -15892,6 +15892,21 @@ <comment>View|Zoom out</comment> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="1127"/> + <source>Network Monitor</source> + <translation type="unfinished">Монитор сети</translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="1127"/> + <source>&Network Monitor...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/HelpWindow.py" line="1132"/> + <source><b>Network Monitor...</b><p>Shows the network monitor dialog.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Hg</name> @@ -16883,32 +16898,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="134"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> @@ -17551,7 +17566,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="312"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> @@ -17772,12 +17787,12 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1129"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> <source>Author</source> <translation>Автор</translation> </message> @@ -20084,7 +20099,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="294"/> <source>unknown</source> <translation type="unfinished">неизвестный</translation> </message> @@ -20903,27 +20918,27 @@ <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="546"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="660"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="643"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -20933,12 +20948,12 @@ <translation>Удалить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="607"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="606"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="643"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -21023,7 +21038,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="458"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -21033,12 +21048,12 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="660"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="546"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -21173,12 +21188,12 @@ <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="249"/> <source>active</source> <translation>активный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="254"/> <source>yes</source> <translation>да</translation> </message> @@ -23293,7 +23308,7 @@ <context> <name>JavaScriptEricObject</name> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="136"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="137"/> <source>Search results provided by {0}</source> <translation>Результаты поиска ({0})</translation> </message> @@ -23308,7 +23323,7 @@ <translation type="obsolete">WEB просмотрщик встроенный в Eric</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="97"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="98"/> <source>Search!</source> <translation>Искать!</translation> </message> @@ -23318,17 +23333,17 @@ <translation type="obsolete">Об Eric</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="95"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="96"/> <source>Welcome to eric5 Web Browser!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="96"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="97"/> <source>eric5 Web Browser</source> <translation type="unfinished">WEB просмотрщик встроенный в Eric5</translation> </message> <message> - <location filename="Helpviewer/HelpBrowserWV.py" line="98"/> + <location filename="Helpviewer/HelpBrowserWV.py" line="99"/> <source>About eric5</source> <translation type="unfinished"></translation> </message> @@ -26608,7 +26623,7 @@ <translation>Сохранить пароль</translation> </message> <message> - <location filename="Helpviewer/Passwords/PasswordManager.py" line="586"/> + <location filename="Helpviewer/Passwords/PasswordManager.py" line="589"/> <source>Re-encoding saved passwords...</source> <translation type="unfinished"></translation> </message> @@ -33779,67 +33794,67 @@ <translation>Найти и заменить</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="42"/> + <location filename="QScintilla/ReplaceWidget.ui" line="33"/> <source>Find:</source> <translation>Найти:</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="71"/> + <location filename="QScintilla/ReplaceWidget.ui" line="62"/> <source>Press to find the previous occurrence</source> <translation>Перейти к предыдущему вхождению</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="78"/> + <location filename="QScintilla/ReplaceWidget.ui" line="69"/> <source>Press to find the next occurrence</source> <translation>Перейти к следующему вхождению</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="85"/> + <location filename="QScintilla/ReplaceWidget.ui" line="76"/> <source>Match case</source> <translation>Учитывать регистр</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="92"/> + <location filename="QScintilla/ReplaceWidget.ui" line="83"/> <source>Whole word</source> <translation>Целое слово</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="106"/> + <location filename="QScintilla/ReplaceWidget.ui" line="97"/> <source>Replace:</source> <translation>Замена:</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="135"/> + <location filename="QScintilla/ReplaceWidget.ui" line="126"/> <source>Press to replace the selection</source> <translation>Заменить выделенный текст</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="149"/> + <location filename="QScintilla/ReplaceWidget.ui" line="140"/> <source>Press to replace all occurrences</source> <translation>Заменить всё</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="32"/> + <location filename="QScintilla/ReplaceWidget.ui" line="23"/> <source>Press to close the window</source> <translation>Закрыть окно</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="99"/> + <location filename="QScintilla/ReplaceWidget.ui" line="90"/> <source>Regexp</source> <translation>Регулярное выражение</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="156"/> + <location filename="QScintilla/ReplaceWidget.ui" line="147"/> <source>Wrap around</source> <translation>Циклический поиск</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="163"/> + <location filename="QScintilla/ReplaceWidget.ui" line="154"/> <source>Selection only</source> <translation>Выделенный</translation> </message> <message> - <location filename="QScintilla/ReplaceWidget.ui" line="142"/> + <location filename="QScintilla/ReplaceWidget.ui" line="133"/> <source>Press to replace the selection and search for the next occurence</source> <translation type="unfinished"></translation> </message> @@ -33847,17 +33862,17 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="QScintilla/SearchReplaceWidget.py" line="506"/> + <location filename="QScintilla/SearchReplaceWidget.py" line="511"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="QScintilla/SearchReplaceWidget.py" line="582"/> + <location filename="QScintilla/SearchReplaceWidget.py" line="587"/> <source>Replaced {0} occurrences.</source> <translation>Заменено в {0} местах.</translation> </message> <message> - <location filename="QScintilla/SearchReplaceWidget.py" line="586"/> + <location filename="QScintilla/SearchReplaceWidget.py" line="591"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>Ничего не заменено, потому что '{0}' не найдено.</translation> </message> @@ -37493,12 +37508,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="551"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="549"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="548"/> <source>Author</source> <translation>Автор</translation> </message> @@ -39420,22 +39435,22 @@ <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="718"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Освободить</translation> </message> @@ -39480,22 +39495,22 @@ <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="735"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> @@ -39637,17 +39652,17 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -39667,17 +39682,17 @@ <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Среди выбранных нет файлов не включенных в список изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -39752,7 +39767,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="504"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -39762,17 +39777,17 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Нет/не выбраны пропущенных элементы.</translation> </message> @@ -50422,77 +50437,77 @@ <translation>Точки просмотра</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="167"/> + <location filename="Debugger/WatchPointViewer.py" line="166"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="139"/> + <location filename="Debugger/WatchPointViewer.py" line="138"/> <source>Enable</source> <translation>Разрешить</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="171"/> + <location filename="Debugger/WatchPointViewer.py" line="170"/> <source>Enable all</source> <translation>Разрешить все</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="142"/> + <location filename="Debugger/WatchPointViewer.py" line="141"/> <source>Disable</source> <translation>Запретить</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="175"/> + <location filename="Debugger/WatchPointViewer.py" line="174"/> <source>Disable all</source> <translation>Запретить все</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="145"/> + <location filename="Debugger/WatchPointViewer.py" line="144"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="179"/> + <location filename="Debugger/WatchPointViewer.py" line="178"/> <source>Delete all</source> <translation>Удалить все</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="169"/> + <location filename="Debugger/WatchPointViewer.py" line="168"/> <source>Enable selected</source> <translation>Разрешить выбранные</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="173"/> + <location filename="Debugger/WatchPointViewer.py" line="172"/> <source>Disable selected</source> <translation>Запретить выбранные</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="177"/> + <location filename="Debugger/WatchPointViewer.py" line="176"/> <source>Delete selected</source> <translation>Удалить выбранные</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="137"/> + <location filename="Debugger/WatchPointViewer.py" line="136"/> <source>Edit...</source> <translation>Правка...</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="225"/> + <location filename="Debugger/WatchPointViewer.py" line="224"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>Выражение для отслеживания '<b>{0}</b>' уже существует.</p></translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="229"/> + <location filename="Debugger/WatchPointViewer.py" line="228"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>Выражение для отслеживания '<b>{0}</b>' для переменной <b>{1}</b> уже существует.</p></translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="232"/> + <location filename="Debugger/WatchPointViewer.py" line="231"/> <source>Watch expression already exists</source> <translation>Выражение для отслеживания уже существует</translation> </message> <message> - <location filename="Debugger/WatchPointViewer.py" line="181"/> + <location filename="Debugger/WatchPointViewer.py" line="180"/> <source>Configure...</source> <translation>Настроить...</translation> </message>