diff -r 0155e7aa345d -r a94b0a2fafd7 i18n/eric5_ru.ts
--- a/i18n/eric5_ru.ts Sat Jul 02 18:19:03 2011 +0200
+++ b/i18n/eric5_ru.ts Sun Jul 03 18:01:53 2011 +0200
@@ -3769,41 +3769,41 @@
<context>
<name>DebugServer</name>
<message>
- <location filename="Debugger/DebugServer.py" line="1257"/>
+ <location filename="Debugger/DebugServer.py" line="1296"/>
<source>Passive debug connection received</source>
<translation>Принято соединение пассивной отладки</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="1271"/>
+ <location filename="Debugger/DebugServer.py" line="1310"/>
<source>Passive debug connection closed</source>
<translation>Соединение пассивной отладки закрыто</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="134"/>
+ <location filename="Debugger/DebugServer.py" line="143"/>
<source>created</source>
<comment>must be same as in EditWatchpointDialog</comment>
<translation>создано</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="136"/>
+ <location filename="Debugger/DebugServer.py" line="145"/>
<source>changed</source>
<comment>must be same as in EditWatchpointDialog</comment>
<translation>изменено</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="573"/>
+ <location filename="Debugger/DebugServer.py" line="582"/>
<source>Connection from illegal host</source>
<translation>соединение с запрещённого хоста</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="1125"/>
+ <location filename="Debugger/DebugServer.py" line="1138"/>
<source>
Not connected
</source>
<translation>Нет соединения</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="573"/>
+ <location filename="Debugger/DebugServer.py" line="582"/>
<source><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></source>
<translation><p>Попытка соединения с недопустимого компьютора <b>{0}</b>. Разрешить соединение?</p></translation>
</message>
@@ -42535,68 +42535,68 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="316"/>
+ <location filename="PyUnit/UnittestDialog.py" line="330"/>
<source>Unittest</source>
<translation>Unittest</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="216"/>
+ <location filename="PyUnit/UnittestDialog.py" line="221"/>
<source>You must enter a test suite file.</source>
<translation>Необходимо ввести имя файла с пакетом тестов.</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="223"/>
+ <location filename="PyUnit/UnittestDialog.py" line="228"/>
<source>Preparing Testsuite</source>
<translation>Подготовка пакета тестов</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="409"/>
+ <location filename="PyUnit/UnittestDialog.py" line="429"/>
<source>Failure: {0}</source>
<translation>Неудача: {0}</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="421"/>
+ <location filename="PyUnit/UnittestDialog.py" line="442"/>
<source>Error: {0}</source>
<translation>Ошибка: {0}</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="98"/>
- <source>^Failure: </source>
- <translation>^Неудача: </translation>
- </message>
- <message>
<location filename="PyUnit/UnittestDialog.py" line="99"/>
+ <source>^Failure: </source>
+ <translation>^Неудача: </translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="100"/>
<source>^Error: </source>
<translation>^Ошибка:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="375"/>
+ <location filename="PyUnit/UnittestDialog.py" line="395"/>
<source>Running</source>
<translation>Выполяется</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="316"/>
+ <location filename="PyUnit/UnittestDialog.py" line="330"/>
<source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source>
<translation><p>Невозможно запустить тест<b>{0}</b>.<br>{1}<br>{2}</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="25"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="26"/>
<source>Enter the test name. Leave empty to use the default name "suite".</source>
<translation>Задайте имя пакета тестов. Оставьте поле пустым, чтобы использовать имя по умолчанию ("suite").</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="28"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="29"/>
<source><b>Testname</b><p>Enter the name of the test to be performed. This name must follow the rules given by Python's unittest module. If this field is empty, the default name of "suite" will be used.</p></source>
<translation><b>Имя теста</b>
<p>Задайте имя теста для исполнения. Имя должно соотвестсвовать правилам модуля Python unittest. Если оставить поле пустым, будет использовано имя по умолчанию ("suite").</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="44"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="45"/>
<source>Enter name of file defining the testsuite</source>
<translation>Задайте имя файла, содержащего пакет тестов</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="47"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="48"/>
<source><b>Testsuite</b>
<p>Enter the name of the file defining the testsuite.
It should have a method with a name given below. If no name is given, the suite() method will be tried. If no such method can be
@@ -42609,122 +42609,122 @@
подходящих классов с тестами.</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="70"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="71"/>
<source>Enter &test name:</source>
<translation>Задайте &имя теста:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="80"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="81"/>
<source>Open a file selection dialog</source>
<translation>Показать диалог выбора файлов</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="83"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <location filename="PyUnit/UnittestDialog.ui" line="90"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="84"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="91"/>
<source>Enter test &filename:</source>
<translation>Задайте &имя файла с тестами:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="109"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="110"/>
<source>Select whether you want to run the test locally</source>
<translation>Хотите ли Вы запустить тест локально</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="112"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="113"/>
<source>Run &local</source>
<translation>Выполнить &локально</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="119"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="120"/>
<source>Select whether coverage data should be collected</source>
<translation>Должны ли собираться данные охвата</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="122"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="123"/>
<source>C&ollect coverage data</source>
<translation>Собирать данные &охвата</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="132"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="133"/>
<source>Select whether old coverage data should be erased</source>
<translation>Должны ли собираться данные охвата</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="135"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="136"/>
<source>&Erase coverage data</source>
<translation>&Удалить данные охвата</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="153"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="154"/>
<source>Progress:</source>
<translation>Прогресс:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="190"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="191"/>
<source>Run:</source>
<translation>Запустить:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="197"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="198"/>
<source>Number of tests run</source>
<translation>Количество запущенных тестов</translation>
</message>
<message>
<location filename="PyUnit/UnittestDialog.ui" line="251"/>
<source>0</source>
- <translation>0</translation>
- </message>
- <message>
- <location filename="PyUnit/UnittestDialog.ui" line="207"/>
+ <translation type="obsolete">0</translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="242"/>
<source>Failures:</source>
<translation>Неудачи:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="214"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="249"/>
<source>Number of test failures</source>
<translation>Количество неудач в тестах</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="224"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="259"/>
<source>Errors:</source>
<translation>Ошибки:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="231"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="266"/>
<source>Number of test errors</source>
<translation>Количество ошибок в тестах</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="241"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="208"/>
<source>Remaining:</source>
<translation>Осталось:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="248"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="215"/>
<source>Number of tests to be run</source>
<translation>Количество ещё не пройденных тестов</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="279"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="348"/>
<source>Tests performed:</source>
<translation>Проведённые тесты:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="289"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="358"/>
<source>Failures and errors:</source>
<translation>Неудачи и ошибки:</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="296"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="365"/>
<source>Failures and Errors list</source>
<translation>Список неудач и ошибок</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="299"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="368"/>
<source><b>Failures and Errors list</b>
<p>This list shows all failed and errored tests.
Double clicking on an entry will show the respective traceback.</p></source>
@@ -42744,7 +42744,7 @@
<translation>Остановить выполняющийся пакет тестов</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="326"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="395"/>
<source>Idle</source>
<translation>Задайте имя, определяющее пакет тестов</translation>
</message>
@@ -42769,30 +42769,75 @@
<translation><b>Остановить</b><p>Остановить выполняющийся пакет тестов.</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="479"/>
+ <location filename="PyUnit/UnittestDialog.py" line="541"/>
<source>Show Source</source>
<translation>Показать исходник</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="164"/>
+ <location filename="PyUnit/UnittestDialog.py" line="169"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation>Python файлы (*.py);;Все файлы (*)</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="160"/>
+ <location filename="PyUnit/UnittestDialog.py" line="165"/>
<source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source>
<translation>Python3 файлы ({1});;Python2 файлы ({0});;Все файлы (*)</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="393"/>
+ <location filename="PyUnit/UnittestDialog.py" line="413"/>
<source>Ran {0} test in {1:.3f}s</source>
<translation>Тест {0} пройден за {1:.3f} секунд</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="396"/>
+ <location filename="PyUnit/UnittestDialog.py" line="416"/>
<source>Ran {0} tests in {1:.3f}s</source>
<translation>{0} Тестов пройдено за {1:.3f} секунд</translation>
</message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="276"/>
+ <source>Skipped:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="283"/>
+ <source>Number of tests skipped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="293"/>
+ <source>Expected Failures:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="300"/>
+ <source>Number of tests with expected failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="310"/>
+ <source>Unexpected Successes:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="317"/>
+ <source>Number of tests with unexpected success</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="455"/>
+ <source> Skipped: {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="468"/>
+ <source> Expected Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="481"/>
+ <source> Unexpected Success</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>UrlBar</name>
@@ -44819,7 +44864,7 @@
<context>
<name>Utilities</name>
<message>
- <location filename="Utilities/__init__.py" line="1022"/>
+ <location filename="Utilities/__init__.py" line="1037"/>
<source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source>
<translation><p>В строках вы можете использовать следующие %-коды::
<table>
@@ -44834,12 +44879,12 @@
<tr><td>%%</td><td>знак процента</td></tr></table></p></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1208"/>
+ <location filename="Utilities/__init__.py" line="1223"/>
<source>Python2 interpreter not configured.</source>
<translation>Интерпретатор Python2 не настроен.</translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1254"/>
+ <location filename="Utilities/__init__.py" line="1269"/>
<source>Python2 interpreter did not finish within 30s.</source>
<translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation>
</message>
