--- a/i18n/eric5_ru.ts Thu Aug 18 12:36:53 2011 +0200
+++ b/i18n/eric5_ru.ts Thu Aug 18 18:03:22 2011 +0200
@@ -3141,32 +3141,32 @@
<context>
<name>Connection</name>
<message>
- <location filename="Cooperation/Connection.py" line="71"/>
+ <location filename="Cooperation/Connection.py" line="72"/>
<source>undefined</source>
<translation>неопределён</translation>
</message>
<message>
- <location filename="Cooperation/Connection.py" line="72"/>
+ <location filename="Cooperation/Connection.py" line="73"/>
<source>unknown</source>
<translation>неизвестный</translation>
</message>
<message>
+ <location filename="Cooperation/Connection.py" line="206"/>
+ <source>New Connection</source>
+ <translation>Новое соединение</translation>
+ </message>
+ <message>
+ <location filename="Cooperation/Connection.py" line="206"/>
+ <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source>
+ <translation><p>Разрешить соединение от<strong>{0}@{1}</strong>?</p></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/Connection.py" line="431"/>
+ <source>* Connection to {0}:{1} refused.</source>
+ <translation>* В соединении к {0}:{1} отказано.</translation>
+ </message>
+ <message>
<location filename="Cooperation/Connection.py" line="196"/>
- <source>New Connection</source>
- <translation>Новое соединение</translation>
- </message>
- <message>
- <location filename="Cooperation/Connection.py" line="196"/>
- <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source>
- <translation><p>Разрешить соединение от<strong>{0}@{1}</strong>?</p></translation>
- </message>
- <message>
- <location filename="Cooperation/Connection.py" line="416"/>
- <source>* Connection to {0}:{1} refused.</source>
- <translation>* В соединении к {0}:{1} отказано.</translation>
- </message>
- <message>
- <location filename="Cooperation/Connection.py" line="186"/>
<source>* Connection attempted by banned user '{0}'.</source>
<translation>* Попытка соединения от запрещённого пользователя '{0}'.</translation>
</message>
@@ -3507,7 +3507,7 @@
<context>
<name>CooperationClient</name>
<message>
- <location filename="Cooperation/CooperationClient.py" line="71"/>
+ <location filename="Cooperation/CooperationClient.py" line="83"/>
<source>unknown</source>
<translation>неизвестный</translation>
</message>
@@ -3515,9 +3515,20 @@
<location filename="Cooperation/CooperationClient.py" line="272"/>
<source>Illegal address: {0}:{1}
</source>
- <translation>Неправильный адрес: {0}:{1}
+ <translation type="obsolete">Неправильный адрес: {0}:{1}
</translation>
</message>
+ <message>
+ <location filename="Cooperation/CooperationClient.py" line="286"/>
+ <source>Illegal address: {0}@{1}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/CooperationClient.py" line="377"/>
+ <source>No servers present.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CooperationPage</name>
@@ -15571,27 +15582,27 @@
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
@@ -15601,87 +15612,87 @@
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -24815,52 +24826,52 @@
<context>
<name>NetworkAccessManager</name>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="169"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/>
<source><b>Enter username and password for '{0}'</b></source>
<translation><b>Введите имя пользователя и пароль для '{0}'</b></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="172"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/>
<source><b>Enter username and password for '{0}', realm '{1}'</b></source>
<translation><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/>
<source>SSL Errors</source>
<translation>Ошибки SSL</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="226"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/>
<source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source>
<translation><p>Ошибки SSL для <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Игнорировать?</p></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/>
<source>Certificates</source>
<translation>Сертификаты</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="239"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/>
<source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source>
<translation><p>Сертификаты:<br/>{0}<br/>Принять?</p></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/>
<source><br/>Issuer: {0}</source>
<translation><br/>Эмитент: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/>
<source><br/>Not valid before: {0}<br/>Valid Until: {1}</source>
<translation><br/>Не действительны ранее: {0}<br/>Действительны до: {1}</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="284"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/>
<source>Name: {0}</source>
<translation>Имя: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="288"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/>
<source><br/>Organization: {0}</source>
<translation><br/>Организация: {0}</translation>
</message>
@@ -43915,12 +43926,12 @@
<translation><p>Корень документации PyQt4 не найден.</p></translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5623"/>
+ <location filename="UI/UserInterface.py" line="5639"/>
<source>Error during updates check</source>
<translation>Ошибка при проверке обновлений</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5610"/>
+ <location filename="UI/UserInterface.py" line="5626"/>
<source>Update available</source>
<translation>Обновления доступны</translation>
</message>
@@ -43930,7 +43941,7 @@
<translation><h3>Номера версий</h3><table></translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5657"/>
+ <location filename="UI/UserInterface.py" line="5673"/>
<source></table></source>
<translation></table></translation>
</message>
@@ -43965,7 +43976,7 @@
<translation>Показать &внешние инструменты</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5623"/>
+ <location filename="UI/UserInterface.py" line="5639"/>
<source>Could not perform updates check.</source>
<translation>Невозможно запустить проверку обновлений.</translation>
</message>
@@ -43980,7 +43991,7 @@
<translation>Пробую узел {0}</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5697"/>
+ <location filename="UI/UserInterface.py" line="5713"/>
<source>First time usage</source>
<translation>Первое использование</translation>
</message>
@@ -44081,7 +44092,7 @@
<translation type="obsolete">Невозможно скачать файл версий.</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5644"/>
+ <location filename="UI/UserInterface.py" line="5660"/>
<source><h3>Available versions</h3><table></source>
<translation><h3>Доступные версии</h3><table></translation>
</message>
@@ -44251,12 +44262,12 @@
<translation><p>Эта часть строки статуса указывает на возможность записи открытого в редакторе файла.</p></translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5672"/>
+ <location filename="UI/UserInterface.py" line="5688"/>
<source>SSL Errors</source>
<translation>Ошибки SSL</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5672"/>
+ <location filename="UI/UserInterface.py" line="5688"/>
<source><p>SSL Errors:</p><p>{0}</p><p>Do you want to ignore these errors?</p></source>
<translation><p>Ошибки SSL: </p><p>{0}</p><p>Игнорировать?</p></translation>
</message>
@@ -44670,22 +44681,22 @@
<translation>Qt3 не поддерживается в eric5.</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5610"/>
+ <location filename="UI/UserInterface.py" line="5626"/>
<source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source>
<translation>На сайте <b>{1}</b> доступно обновление eric5 до версии <b>{0}</b>. Скачать?</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5619"/>
+ <location filename="UI/UserInterface.py" line="5635"/>
<source>Eric5 is up to date</source>
<translation>Eric5 не требует обновлений</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5619"/>
+ <location filename="UI/UserInterface.py" line="5635"/>
<source>You are using the latest version of eric5</source>
<translation>Вы используете самую последнюю версию eric5</translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5697"/>
+ <location filename="UI/UserInterface.py" line="5713"/>
<source>eric5 has not been configured yet. The configuration dialog will be started.</source>
<translation>eric5 ещё не сконфигурирован. Будет запущен диалог конфигурации.</translation>
</message>
@@ -44827,12 +44838,12 @@
<translation><b>Документация Pyton 2</b><p>Показать Pyton 2 документацию. Если местонахождение документации не было настроено, то искать в подкаталоге <i>doc</i> каталога где находится исполняемый файл Python 2 под Windows и в подкаталоге <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной окружения PYTHON2DOCDIR.</p></translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5537"/>
+ <location filename="UI/UserInterface.py" line="5553"/>
<source>Error getting versions information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="UI/UserInterface.py" line="5537"/>
+ <location filename="UI/UserInterface.py" line="5547"/>
<source>The versions information could not be downloaded. Please go online and try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -44846,6 +44857,11 @@
<source>Could not start a web browser</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="UI/UserInterface.py" line="5553"/>
+ <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>UserPropertiesDialog</name>
