--- a/i18n/eric5_ru.ts Wed Apr 24 19:44:41 2013 +0200
+++ b/i18n/eric5_ru.ts Wed Apr 24 20:01:41 2013 +0200
@@ -2486,22 +2486,22 @@
<context>
<name>BrowserModel</name>
<message>
- <location filename="UI/BrowserModel.py" line="44"/>
+ <location filename="UI/BrowserModel.py" line="51"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="602"/>
+ <location filename="UI/BrowserModel.py" line="604"/>
<source>Attributes</source>
<translation>Атрибуты</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="556"/>
+ <location filename="UI/BrowserModel.py" line="558"/>
<source>Coding: {0}</source>
<translation>Кодировка: {0}</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="561"/>
+ <location filename="UI/BrowserModel.py" line="563"/>
<source>Globals</source>
<translation>Глобальные переменные</translation>
</message>
@@ -2511,7 +2511,7 @@
<translation type="obsolete">Атрибуты (глобальные)</translation>
</message>
<message>
- <location filename="UI/BrowserModel.py" line="612"/>
+ <location filename="UI/BrowserModel.py" line="614"/>
<source>Class Attributes</source>
<translation>Атрибуты класса</translation>
</message>
@@ -3179,7 +3179,7 @@
<context>
<name>CodingError</name>
<message>
- <location filename="Utilities/__init__.py" line="94"/>
+ <location filename="Utilities/__init__.py" line="96"/>
<source>The coding '{0}' is wrong for the given text.</source>
<translation>Кодировка '{0}' не подходит для выбранного текста.</translation>
</message>
@@ -13057,27 +13057,27 @@
<translation type="obsolete">Утилиты помощи Qt4</translation>
</message>
<message>
- <location filename="Plugins/PluginEricdoc.py" line="132"/>
+ <location filename="Plugins/PluginEricdoc.py" line="130"/>
<source>Generate documentation (eric5_doc)</source>
<translation>Создать документацию (eric5_doc)</translation>
</message>
<message>
- <location filename="Plugins/PluginEricdoc.py" line="132"/>
+ <location filename="Plugins/PluginEricdoc.py" line="130"/>
<source>Generate &documentation (eric5_doc)</source>
<translation>Создать &документацию (eric5_doc)</translation>
</message>
<message>
+ <location filename="Plugins/PluginEricdoc.py" line="133"/>
+ <source>Generate API documentation using eric5_doc</source>
+ <translation>Создать документацию на API с помощью eric5_doc</translation>
+ </message>
+ <message>
<location filename="Plugins/PluginEricdoc.py" line="135"/>
- <source>Generate API documentation using eric5_doc</source>
- <translation>Создать документацию на API с помощью eric5_doc</translation>
- </message>
- <message>
- <location filename="Plugins/PluginEricdoc.py" line="137"/>
<source><b>Generate documentation</b><p>Generate API documentation using eric5_doc.</p></source>
<translation><b>Создать документацию</b><p>Создать документацию на API с помощью eric5_doc</p></translation>
</message>
<message>
- <location filename="Plugins/PluginEricdoc.py" line="88"/>
+ <location filename="Plugins/PluginEricdoc.py" line="86"/>
<source>Qt Help Tools</source>
<translation>Утилиты помощи Qt</translation>
</message>
@@ -23849,7 +23849,7 @@
<translation>Зафиксировать</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/>
<source>There are no uncommitted changes available/selected.</source>
<translation>Нет доступных/выбранных неотправленных изменений.</translation>
</message>
@@ -23864,7 +23864,7 @@
<translation>Нет/не выбраны неверсионные элементы.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/>
<source>Revert</source>
<translation>Откатить</translation>
</message>
@@ -23879,7 +23879,7 @@
<translation>Удалить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="646"/>
<source>There are no missing entries available/selected.</source>
<translation>Нет/не выбраны пропущенных элементы.</translation>
</message>
@@ -23974,7 +23974,7 @@
<translation type="obsolete">Различие</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="661"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="663"/>
<source>Differences</source>
<translation>Различия</translation>
</message>
@@ -33395,27 +33395,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="Preferences/__init__.py" line="1132"/>
+ <location filename="Preferences/__init__.py" line="1131"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1159"/>
+ <location filename="Preferences/__init__.py" line="1158"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1159"/>
+ <location filename="Preferences/__init__.py" line="1158"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1253"/>
+ <location filename="Preferences/__init__.py" line="1252"/>
<source>Select Python2 Interpreter</source>
<translation>Выбрать интерпретатор Python 2</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1253"/>
+ <location filename="Preferences/__init__.py" line="1252"/>
<source>Select the Python2 interpreter to be used:</source>
<translation>Выбрать интерпретатор Python 2 для использования:</translation>
</message>
@@ -39601,7 +39601,7 @@
<context>
<name>QtPage</name>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="79"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="46"/>
<source>...</source>
<translation>...</translation>
</message>
@@ -39621,7 +39621,7 @@
<translation type="obsolete">Задайте путь для каталога переводов Qt4.</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.py" line="75"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.py" line="55"/>
<source>Select Qt4 Translations Directory</source>
<translation>Выберите каталог переводов Qt4</translation>
</message>
@@ -39631,7 +39631,7 @@
<translation><b>Настроить Qt</b></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="113"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="80"/>
<source>Qt Tools</source>
<translation>Утилиты Qt</translation>
</message>
@@ -39656,12 +39656,12 @@
<translation type="obsolete">Префикс Qt4:</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="163"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="130"/>
<source>This gives an example of the complete tool name</source>
<translation>Предпросмотр полного имени утилиты</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="166"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="133"/>
<source>designer</source>
<translation>designer</translation>
</message>
@@ -39676,7 +39676,7 @@
<translation type="obsolete">Каталог Qt4</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="93"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="60"/>
<source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source>
<translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation>
</message>
@@ -39693,65 +39693,50 @@
<message>
<location filename="Preferences/ConfigurationPages/QtPage.py" line="61"/>
<source>Select Qt4 Directory</source>
- <translation>Выберите каталог Qt4</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="119"/>
+ <translation type="obsolete">Выберите каталог Qt4</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/>
<source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source>
<translation>Имя исполняемого файла для утилиты состоит из префикса, имени утилиты и постфикса. В win32 автоматически добавляется расширение.</translation>
</message>
<message>
<location filename="Preferences/ConfigurationPages/QtPage.ui" line="37"/>
- <source>Qt Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="50"/>
- <source>Enter the path of the Qt directory.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="57"/>
- <source>Press to select the Qt directory via a directory selection dialog</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/>
<source>Qt Translations Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="76"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="43"/>
<source>Press to select the Qt translations directory via a directory selection dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="86"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="53"/>
<source>Enter the path of the Qt translations directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="100"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="67"/>
<source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="129"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="96"/>
<source>Qt-Prefix:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="136"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="103"/>
<source>Enter the prefix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="143"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="110"/>
<source>Qt-Postfix:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/QtPage.ui" line="150"/>
+ <location filename="Preferences/ConfigurationPages/QtPage.ui" line="117"/>
<source>Enter the postfix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
@@ -47010,17 +46995,17 @@
<translation>Зафиксировать</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/>
<source>There are no uncommitted changes available/selected.</source>
<translation>Нет доступных/выбранных неотправленных изменений.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/>
<source>Lock</source>
<translation>Захватить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="719"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/>
<source>Unlock</source>
<translation>Освободить</translation>
</message>
@@ -47065,22 +47050,22 @@
<translation>заменено</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="703"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/>
<source>There are no unlocked files available/selected.</source>
<translation>Нет доступных/выбранных незахваченных файлов.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/>
<source>There are no locked files available/selected.</source>
<translation>Нет доступных/выбранных захваченных файлов.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="736"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/>
<source>Break Lock</source>
<translation>Нарушить захват</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/>
<source>Steal Lock</source>
<translation>Украсть захват</translation>
</message>
@@ -47232,7 +47217,7 @@
<translation>Нет/не выбраны неверсионные элементы.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/>
<source>Revert</source>
<translation>Откатить</translation>
</message>
@@ -47252,17 +47237,17 @@
<translation>Добавить к списку изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/>
<source>Remove from Changelist</source>
<translation>Удалить из списка изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="769"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/>
<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="787"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/>
<source>There are no files available/selected belonging to a changelist.</source>
<translation>Среди выбранных нет файлов включенных в список изменений.</translation>
</message>
@@ -47347,7 +47332,7 @@
<translation type="obsolete">Различие</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="683"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/>
<source>Differences</source>
<translation type="unfinished">Различия</translation>
</message>
@@ -47357,7 +47342,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="666"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/>
<source>There are no missing entries available/selected.</source>
<translation>Нет/не выбраны пропущенных элементы.</translation>
</message>
@@ -55718,7 +55703,7 @@
<context>
<name>Utilities</name>
<message>
- <location filename="Utilities/__init__.py" line="1145"/>
+ <location filename="Utilities/__init__.py" line="1147"/>
<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>
@@ -55733,12 +55718,12 @@
<tr><td>%%</td><td>знак процента</td></tr></table></p></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1345"/>
+ <location filename="Utilities/__init__.py" line="1337"/>
<source>Python2 interpreter not configured.</source>
<translation>Интерпретатор Python2 не настроен.</translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1395"/>
+ <location filename="Utilities/__init__.py" line="1387"/>
<source>Python2 interpreter did not finish within 30s.</source>
<translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation>
</message>
@@ -60401,12 +60386,12 @@
<translation type="obsolete">Импорт пакетов...</translation>
</message>
<message>
- <location filename="eric5.py" line="253"/>
+ <location filename="eric5.py" line="250"/>
<source>Generating Main Window...</source>
<translation>Создание главного окна...</translation>
</message>
<message>
- <location filename="eric5.py" line="248"/>
+ <location filename="eric5.py" line="245"/>
<source>Starting...</source>
<translation>Запуск...</translation>
</message>
