diff -r 4a946734fd27 -r df49a5ab1c9c i18n/eric5_ru.ts
--- a/i18n/eric5_ru.ts Fri Oct 03 16:39:04 2014 +0200
+++ b/i18n/eric5_ru.ts Fri Oct 03 16:49:13 2014 +0200
@@ -35447,27 +35447,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1161"/>
+ <location filename="../Preferences/__init__.py" line="1163"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1189"/>
+ <location filename="../Preferences/__init__.py" line="1191"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1189"/>
+ <location filename="../Preferences/__init__.py" line="1191"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1291"/>
+ <location filename="../Preferences/__init__.py" line="1293"/>
<source>Select Python{0} Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1291"/>
+ <location filename="../Preferences/__init__.py" line="1293"/>
<source>Select the Python{0} interpreter to be used:</source>
<translation type="unfinished"></translation>
</message>
@@ -37245,287 +37245,287 @@
<context>
<name>ProjectFormsBrowser</name>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="942"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="949"/>
<source>Forms</source>
<translation>Формы</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="77"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="79"/>
<source><b>Project Forms Browser</b><p>This allows to easily see all forms contained in the current project. Several actions can be executed via the context menu.</p></source>
<translation><b>Обозреватель форм</b><p>Позволяет легко обозревать формы, содержащиеся в текущем проекте. Некоторые действия над ними доступны посредством контекстного меню.</p></translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="152"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="154"/>
<source>Compile form</source>
<translation>Компилировать форму</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="330"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="332"/>
<source>Compile all forms</source>
<translation>Компилировать все формы</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="241"/>
- <source>Open in Qt-Designer</source>
- <translation>Открыть в Дизайнере Qt</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="291"/>
- <source>Remove from project</source>
- <translation>Удалить из проекта</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="294"/>
- <source>Delete</source>
- <translation>Удалить</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="338"/>
- <source>Add forms directory...</source>
- <translation>Добавить каталог с формами...</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="729"/>
- <source>Form Compilation</source>
- <translation>Компиляция форм</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="701"/>
- <source>The compilation of the form file was successful.</source>
- <translation>Компиляция формы прошла успешно.</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="729"/>
- <source>The compilation of the form file failed.</source>
- <translation>Компиляция формы не удалась.</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="808"/>
- <source>Process Generation Error</source>
- <translation>Ошибка процесса генерации</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="900"/>
- <source>Compiling forms...</source>
- <translation>Компилирую формы...</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="900"/>
- <source>Abort</source>
- <translation>Отмена</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="96"/>
- <source>Dialog</source>
- <translation>Диалог</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="97"/>
- <source>Widget</source>
- <translation>Элемент интерфейса</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="101"/>
- <source>Dialog with Buttons (Bottom)</source>
- <translation>Дталог с кнопками (снизу)</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="103"/>
- <source>Dialog with Buttons (Right)</source>
- <translation>Дталог с кнопками (справа)</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="303"/>
- <source>New form...</source>
- <translation>Новая форма...</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="341"/>
- <source>Expand all directories</source>
- <translation>Раскрыть все подкаталоги</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="343"/>
- <source>Collapse all directories</source>
- <translation>Скрыть все подкаталоги</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="597"/>
- <source>New Form</source>
- <translation>Новая форма</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="552"/>
- <source>Select a form type:</source>
- <translation>Выберите тип формы:</translation>
- </message>
- <message>
<location filename="../Project/ProjectFormsBrowser.py" line="243"/>
- <source>Open in Editor</source>
- <translation>Открыть в редакторе</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="178"/>
- <source>Rename file</source>
- <translation>Переименовать файл</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="250"/>
- <source>Compile forms</source>
- <translation>Компилировать формы</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="624"/>
- <source>Delete forms</source>
- <translation>Удалить формы</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="624"/>
- <source>Do you really want to delete these forms from the project?</source>
- <translation>Вы правда хотите удалить выбранные формы из проекта?</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="597"/>
- <source><p>The new form file <b>{0}</b> could not be created.<br>Problem: {1}</p></source>
- <translation><p>Файл с формой <b>{0}</b> не может быть создан из-за следующей проблемы: {1}</p></translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="147"/>
- <source>Preview form</source>
- <translation>Предпросмотр формы</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="246"/>
- <source>Preview translations</source>
- <translation>Предпросмотр переводов</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="716"/>
- <source><p>The compilation of the form file failed.</p><p>Reason: {0}</p></source>
- <translation><p>Компиляция формы не удалась по причине: {0}</p></translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="808"/>
- <source>Could not start {0}.<br>Ensure that it is in the search path.</source>
- <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в пути поиска.</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="336"/>
- <source>Add forms...</source>
- <translation>Добавить формы...</translation>
+ <source>Open in Qt-Designer</source>
+ <translation>Открыть в Дизайнере Qt</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="293"/>
+ <source>Remove from project</source>
+ <translation>Удалить из проекта</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="296"/>
+ <source>Delete</source>
+ <translation>Удалить</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="340"/>
+ <source>Add forms directory...</source>
+ <translation>Добавить каталог с формами...</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="731"/>
+ <source>Form Compilation</source>
+ <translation>Компиляция форм</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="703"/>
+ <source>The compilation of the form file was successful.</source>
+ <translation>Компиляция формы прошла успешно.</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="731"/>
+ <source>The compilation of the form file failed.</source>
+ <translation>Компиляция формы не удалась.</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="815"/>
+ <source>Process Generation Error</source>
+ <translation>Ошибка процесса генерации</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="907"/>
+ <source>Compiling forms...</source>
+ <translation>Компилирую формы...</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="907"/>
+ <source>Abort</source>
+ <translation>Отмена</translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="98"/>
+ <source>Dialog</source>
+ <translation>Диалог</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="99"/>
+ <source>Widget</source>
+ <translation>Элемент интерфейса</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="103"/>
+ <source>Dialog with Buttons (Bottom)</source>
+ <translation>Дталог с кнопками (снизу)</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="105"/>
+ <source>Dialog with Buttons (Right)</source>
+ <translation>Дталог с кнопками (справа)</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="305"/>
+ <source>New form...</source>
+ <translation>Новая форма...</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="343"/>
+ <source>Expand all directories</source>
+ <translation>Раскрыть все подкаталоги</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="345"/>
+ <source>Collapse all directories</source>
+ <translation>Скрыть все подкаталоги</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="599"/>
+ <source>New Form</source>
+ <translation>Новая форма</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="554"/>
+ <source>Select a form type:</source>
+ <translation>Выберите тип формы:</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="245"/>
+ <source>Open in Editor</source>
+ <translation>Открыть в редакторе</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="180"/>
+ <source>Rename file</source>
+ <translation>Переименовать файл</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="252"/>
+ <source>Compile forms</source>
+ <translation>Компилировать формы</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="626"/>
+ <source>Delete forms</source>
+ <translation>Удалить формы</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="626"/>
+ <source>Do you really want to delete these forms from the project?</source>
+ <translation>Вы правда хотите удалить выбранные формы из проекта?</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="599"/>
+ <source><p>The new form file <b>{0}</b> could not be created.<br>Problem: {1}</p></source>
+ <translation><p>Файл с формой <b>{0}</b> не может быть создан из-за следующей проблемы: {1}</p></translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="149"/>
+ <source>Preview form</source>
+ <translation>Предпросмотр формы</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="248"/>
+ <source>Preview translations</source>
+ <translation>Предпросмотр переводов</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="718"/>
+ <source><p>The compilation of the form file failed.</p><p>Reason: {0}</p></source>
+ <translation><p>Компиляция формы не удалась по причине: {0}</p></translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="815"/>
+ <source>Could not start {0}.<br>Ensure that it is in the search path.</source>
+ <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в пути поиска.</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="338"/>
+ <source>Add forms...</source>
+ <translation>Добавить формы...</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="100"/>
<source>Main Window</source>
<translation>Главное окно</translation>
</message>
<message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="104"/>
+ <source>Dialog with Buttons (Bottom-Center)</source>
+ <translation>Диалог с кнопками (снизу в центре)</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="945"/>
+ <source>Determining changed forms...</source>
+ <translation>Определяю изменённые формы...</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="974"/>
+ <source>Compiling changed forms...</source>
+ <translation>Компилирую изменённые формы...</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="587"/>
+ <source>The file already exists! Overwrite it?</source>
+ <translation>Файл уже существует! Перезаписать?</translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="101"/>
+ <source>Dialog with Buttonbox (Bottom)</source>
+ <translation>Диалог с кнопками (снизу)</translation>
+ </message>
+ <message>
<location filename="../Project/ProjectFormsBrowser.py" line="102"/>
- <source>Dialog with Buttons (Bottom-Center)</source>
- <translation>Диалог с кнопками (снизу в центре)</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="938"/>
- <source>Determining changed forms...</source>
- <translation>Определяю изменённые формы...</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="967"/>
- <source>Compiling changed forms...</source>
- <translation>Компилирую изменённые формы...</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="585"/>
- <source>The file already exists! Overwrite it?</source>
- <translation>Файл уже существует! Перезаписать?</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="99"/>
- <source>Dialog with Buttonbox (Bottom)</source>
- <translation>Диалог с кнопками (снизу)</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="100"/>
<source>Dialog with Buttonbox (Right)</source>
<translation>Диалог с кнопками (справа)</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="163"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="165"/>
<source>Generate Dialog Code...</source>
<translation>Создать код для диалога...</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="260"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="262"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="566"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="568"/>
<source>Qt User-Interface Files (*.ui);;All Files (*)</source>
<translation>Файлы описания интерфейса Qt (*.ui);;Все файлы (*)</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="346"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="348"/>
<source>Configure...</source>
<translation>Настроить...</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="312"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="314"/>
<source>Copy Path to Clipboard</source>
<translation>Сопировать путь в буфер обмена</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="105"/>
- <source>QWizard</source>
- <translation>Мастер</translation>
- </message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="106"/>
- <source>QWizardPage</source>
- <translation>Страница Мастера</translation>
- </message>
- <message>
<location filename="../Project/ProjectFormsBrowser.py" line="107"/>
- <source>QDockWidget</source>
- <translation type="unfinished"></translation>
+ <source>QWizard</source>
+ <translation>Мастер</translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="108"/>
- <source>QFrame</source>
- <translation type="unfinished"></translation>
+ <source>QWizardPage</source>
+ <translation>Страница Мастера</translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="109"/>
- <source>QGroupBox</source>
+ <source>QDockWidget</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="110"/>
- <source>QScrollArea</source>
+ <source>QFrame</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="111"/>
- <source>QMdiArea</source>
+ <source>QGroupBox</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="112"/>
- <source>QTabWidget</source>
+ <source>QScrollArea</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="113"/>
- <source>QToolBox</source>
+ <source>QMdiArea</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Project/ProjectFormsBrowser.py" line="114"/>
+ <source>QTabWidget</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="115"/>
+ <source>QToolBox</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Project/ProjectFormsBrowser.py" line="116"/>
<source>QStackedWidget</source>
<translation></translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="938"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="945"/>
<source>%v/%m Forms</source>
<translation type="unfinished"></translation>
</message>
@@ -43156,7 +43156,7 @@
<context>
<name>QtPage</name>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.py" line="60"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.py" line="66"/>
<source>Select Qt4 Translations Directory</source>
<translation>Выберите каталог переводов Qt4</translation>
</message>
@@ -43230,6 +43230,26 @@
<source>Enter the postfix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="140"/>
+ <source>pyuic / pyside-uic Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="146"/>
+ <source>Indent Width:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/>
+ <source>Select the indent width (default: 4)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="185"/>
+ <source>Generate imports relative to '.'</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Queues</name>
