--- a/i18n/eric5_ru.ts Sat Oct 23 19:54:52 2010 +0200
+++ b/i18n/eric5_ru.ts Sun Oct 24 17:34:10 2010 +0200
@@ -2645,262 +2645,267 @@
<context>
<name>ConfigurationWidget</name>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="97"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="107"/>
<source>Application</source>
<translation>Приложение</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="103"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="113"/>
<source>CORBA</source>
<translation>CORBA</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="106"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="116"/>
<source>Email</source>
<translation>E-mail</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="109"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="119"/>
<source>Graphics</source>
<translation>Графика</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="112"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="122"/>
<source>Icons</source>
<translation>Пиктограммы</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="118"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="128"/>
<source>Plugin Manager</source>
<translation>Менеджер плагинов</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="121"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="131"/>
<source>Printer</source>
<translation>Принтер</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="278"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="291"/>
<source>Python</source>
<translation>Python</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="130"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="140"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="133"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="143"/>
<source>Shell</source>
<translation>Оболочка</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="136"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="146"/>
<source>Tasks</source>
<translation>Задачи</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="139"/>
- <source>Templates</source>
- <translation>Шаблоны</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="145"/>
- <source>Version Control Systems</source>
- <translation>Системы контроля версий</translation>
- </message>
- <message>
<location filename="Preferences/ConfigurationDialog.py" line="149"/>
+ <source>Templates</source>
+ <translation>Шаблоны</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="158"/>
+ <source>Version Control Systems</source>
+ <translation>Системы контроля версий</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="162"/>
<source>Debugger</source>
<translation>Отладчик</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="161"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="174"/>
<source>Ruby</source>
<translation>Ruby</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="165"/>
- <source>Editor</source>
- <translation>Редактор</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="168"/>
- <source>APIs</source>
- <translation>API</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="171"/>
- <source>Autocompletion</source>
- <translation>Автозавершение</translation>
- </message>
- <message>
<location filename="Preferences/ConfigurationDialog.py" line="178"/>
- <source>Calltips</source>
- <translation>Подсказки</translation>
+ <source>Editor</source>
+ <translation>Редактор</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="181"/>
+ <source>APIs</source>
+ <translation>API</translation>
</message>
<message>
<location filename="Preferences/ConfigurationDialog.py" line="184"/>
+ <source>Autocompletion</source>
+ <translation>Автозавершение</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="191"/>
+ <source>Calltips</source>
+ <translation>Подсказки</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="197"/>
<source>General</source>
<translation>Общее</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="199"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="212"/>
<source>Typing</source>
<translation>Набор</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="202"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="215"/>
<source>Exporters</source>
<translation>Экспортёры</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="206"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="219"/>
<source>Highlighters</source>
<translation>Подсветчики</translation>
</message>
<message>
+ <location filename="Preferences/ConfigurationDialog.py" line="222"/>
+ <source>Filetype Associations</source>
+ <translation>Ассоциации для типа файла</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="226"/>
+ <source>Styles</source>
+ <translation>Стили</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="295"/>
+ <source>Help</source>
+ <translation>Помощь</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="301"/>
+ <source>Help Documentation</source>
+ <translation>Справка</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="305"/>
+ <source>Help Viewers</source>
+ <translation>Просмотрщики справки</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="260"/>
+ <source>Project</source>
+ <translation>Проект</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="257"/>
+ <source>Project Viewer</source>
+ <translation>Просмотрщик проекта</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="263"/>
+ <source>Multiproject</source>
+ <translation>Мултипроект</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="270"/>
+ <source>Interface</source>
+ <translation>Интерфейс</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="273"/>
+ <source>Viewmanager</source>
+ <translation>Управление видом</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="453"/>
+ <source>Configuration Page Error</source>
+ <translation>Ошибка страницы конфигурации</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="453"/>
+ <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source>
+ <translation><p>Страница конфигурации <b>{0}</b> не может быть загружена.</p></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="200"/>
+ <source>Filehandling</source>
+ <translation>Режим работы с файлами</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="203"/>
+ <source>Searching</source>
+ <translation>Поиск</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="298"/>
+ <source>Appearance</source>
+ <translation>Стили</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="194"/>
+ <source>QScintilla</source>
+ <translation>QScintilla</translation>
+ </message>
+ <message>
<location filename="Preferences/ConfigurationDialog.py" line="209"/>
- <source>Filetype Associations</source>
- <translation>Ассоциации для типа файла</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="213"/>
- <source>Styles</source>
- <translation>Стили</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="282"/>
- <source>Help</source>
- <translation>Помощь</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="288"/>
- <source>Help Documentation</source>
- <translation>Справка</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="292"/>
- <source>Help Viewers</source>
- <translation>Просмотрщики справки</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="247"/>
- <source>Project</source>
- <translation>Проект</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="244"/>
- <source>Project Viewer</source>
- <translation>Просмотрщик проекта</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="250"/>
- <source>Multiproject</source>
- <translation>Мултипроект</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="257"/>
- <source>Interface</source>
- <translation>Интерфейс</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="260"/>
- <source>Viewmanager</source>
- <translation>Управление видом</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="425"/>
- <source>Configuration Page Error</source>
- <translation>Ошибка страницы конфигурации</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="425"/>
- <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source>
- <translation><p>Страница конфигурации <b>{0}</b> не может быть загружена.</p></translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="187"/>
- <source>Filehandling</source>
- <translation>Режим работы с файлами</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="190"/>
- <source>Searching</source>
- <translation>Поиск</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="285"/>
- <source>Appearance</source>
- <translation>Стили</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="181"/>
- <source>QScintilla</source>
- <translation>QScintilla</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationDialog.py" line="196"/>
<source>Style</source>
<translation>Стиль</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="220"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="233"/>
<source>Properties</source>
<translation>Свойства</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="386"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="414"/>
<source>Preferences</source>
<translation>Предпочтения</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="391"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="419"/>
<source>Please select an entry of the list
to display the configuration page.</source>
<translation>Выберите элемент в списке, чтобы
показать страницу конфигурации.</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="142"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="152"/>
<source>Terminal</source>
<translation>Терминал</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="275"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="288"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="193"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="206"/>
<source>Spell checking</source>
<translation>Проверка орфографии</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="158"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="171"/>
<source>Python3</source>
<translation>Python3</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="295"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="308"/>
<source>Eric Web Browser</source>
<translation>Просмотрщик Web</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="124"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="134"/>
<source>Py3Flakes</source>
<translation>Py3Flakes</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="217"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="230"/>
<source>Keywords</source>
<translation>Ключевые слова</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="100"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="110"/>
<source>Cooperation</source>
<translation>Кооперация</translation>
</message>
+ <message>
+ <location filename="Preferences/ConfigurationDialog.py" line="320"/>
+ <source>Tray Starter</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Connection</name>
@@ -14566,167 +14571,167 @@
<translation>Подача изменений в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="429"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="431"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Синхронизация с репозиторием</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Добавление файлов/каталогов в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="537"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="539"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Удаление файлов/каталогов из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="595"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="597"/>
<source>Renaming {0}</source>
<translation>Переименование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="774"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/>
<source>Merging</source>
<translation>Слияние</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1243"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1245"/>
<source>Mercurial Log</source>
<translation>лог</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1243"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1245"/>
<source>Select number of entries to show.</source>
<translation>Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1318"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1347"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1349"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1458"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/>
<source>Taging in the Mercurial repository</source>
<translation>Создание меток в репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="733"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="735"/>
<source>Reverting changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="977"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="979"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1478"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
<source>Enter branch name</source>
<translation>Введите имя ветви</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1489"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1609"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1630"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1632"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1512"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1514"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1860"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1903"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1653"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1678"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1678"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/>
<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="1933"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1724"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
@@ -14736,27 +14741,27 @@
<translation type="obsolete"><p>Файл изменений <b>{0}</b> уже существует.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1843"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1845"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1962"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
@@ -15297,12 +15302,12 @@
<translation>Alt+П</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="139"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="131"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="139"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="131"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
@@ -23801,12 +23806,12 @@
<context>
<name>Preferences</name>
<message>
- <location filename="Preferences/__init__.py" line="879"/>
+ <location filename="Preferences/__init__.py" line="885"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="898"/>
+ <location filename="Preferences/__init__.py" line="904"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
@@ -37519,120 +37524,178 @@
<context>
<name>TrayStarter</name>
<message>
- <location filename="Tools/TrayStarter.py" line="53"/>
+ <location filename="Tools/TrayStarter.py" line="55"/>
<source>Recent Projects</source>
<translation>Недавние проекты</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="63"/>
+ <location filename="Tools/TrayStarter.py" line="65"/>
<source>Recent Files</source>
<translation>Недавние файлы</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="73"/>
+ <location filename="Tools/TrayStarter.py" line="76"/>
<source>QRegExp editor</source>
<translation>Редактор QRegExp</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="74"/>
- <source>Python re editor</source>
- <translation>Редактор рекулярных выражений Python re</translation>
- </message>
- <message>
<location filename="Tools/TrayStarter.py" line="77"/>
+ <source>Python re editor</source>
+ <translation>Редактор рекулярных выражений Python re</translation>
+ </message>
+ <message>
+ <location filename="Tools/TrayStarter.py" line="80"/>
<source>UI Previewer</source>
<translation>Педпросмотр UI</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="79"/>
+ <location filename="Tools/TrayStarter.py" line="82"/>
<source>Translations Previewer</source>
<translation>Предпросмотр переводов</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="81"/>
+ <location filename="Tools/TrayStarter.py" line="84"/>
<source>Unittest</source>
<translation>Unittest</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="87"/>
+ <location filename="Tools/TrayStarter.py" line="90"/>
<source>Compare Files</source>
<translation>Сравнить файлы</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="89"/>
+ <location filename="Tools/TrayStarter.py" line="92"/>
<source>Compare Files side by side</source>
<translation>Сравнить файлы с параллальным отображением (side by side)</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="105"/>
+ <location filename="Tools/TrayStarter.py" line="108"/>
<source>Preferences</source>
<translation>Предпочтения</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="122"/>
+ <location filename="Tools/TrayStarter.py" line="129"/>
<source>Quit</source>
<translation>Выход</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="198"/>
+ <location filename="Tools/TrayStarter.py" line="205"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="198"/>
+ <location filename="Tools/TrayStarter.py" line="205"/>
<source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation><p>Невозможно запустить процесс.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="198"/>
+ <location filename="Tools/TrayStarter.py" line="205"/>
<source>OK</source>
<translation>OK</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="97"/>
+ <location filename="Tools/TrayStarter.py" line="100"/>
<source>Install Plugin</source>
<translation>Установить подключаемый модуль</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="99"/>
+ <location filename="Tools/TrayStarter.py" line="102"/>
<source>Uninstall Plugin</source>
<translation>Убрать подключаемый модуль</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="101"/>
+ <location filename="Tools/TrayStarter.py" line="104"/>
<source>Plugin Repository</source>
<translation>Репозиторий плагинов</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="58"/>
+ <location filename="Tools/TrayStarter.py" line="60"/>
<source>Recent Multiprojects</source>
<translation>Недавние мултипроекты</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="93"/>
+ <location filename="Tools/TrayStarter.py" line="96"/>
<source>SQL Browser</source>
<translation>Просмотрщик SQL</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="83"/>
+ <location filename="Tools/TrayStarter.py" line="86"/>
<source>Web Browser</source>
<translation>Просмотрщик Web</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="67"/>
+ <location filename="Tools/TrayStarter.py" line="69"/>
<source>Eric5 tray starter</source>
<translation>Запуск Eric5 в системном лотке</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="107"/>
+ <location filename="Tools/TrayStarter.py" line="110"/>
<source>eric5 IDE</source>
<translation>eric5 IDE</translation>
</message>
<message>
- <location filename="Tools/TrayStarter.py" line="109"/>
+ <location filename="Tools/TrayStarter.py" line="112"/>
<source>eric5 Mini Editor</source>
<translation>Мини-редактор eric5</translation>
</message>
+ <message>
+ <location filename="Tools/TrayStarter.py" line="116"/>
+ <source>Preferences (tray starter)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>TrayStarterPage</name>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="17"/>
+ <source><b>Configure Tray Starter</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="37"/>
+ <source>Icon</source>
+ <translation type="unfinished">Иконка</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="43"/>
+ <source>Select to use the standard icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="46"/>
+ <source>Standard Icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="53"/>
+ <source>Select to use the high contrast icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="56"/>
+ <source>High Contrast Icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="63"/>
+ <source>Select to use a black and white icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="66"/>
+ <source>Black and White Icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="73"/>
+ <source>Select to use an inverse black and white icon</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/TrayStarterPage.ui" line="76"/>
+ <source>Inverse Black and White Icon</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>UIPreviewer</name>
@@ -44295,12 +44358,12 @@
<context>
<name>eric5</name>
<message>
- <location filename="eric5.py" line="226"/>
+ <location filename="eric5.py" line="236"/>
<source>Importing packages...</source>
<translation>Импорт пакетов...</translation>
</message>
<message>
- <location filename="eric5.py" line="231"/>
+ <location filename="eric5.py" line="241"/>
<source>Generating Main Window...</source>
<translation>Создание главного окна...</translation>
</message>
@@ -44308,17 +44371,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1409"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1415"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1420"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1422"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -44329,30 +44392,30 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Tip</b></td><td></td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1405"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1407"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1417"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1419"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1030"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1032"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Предок #{0}</b></td><td></td></tr>
<tr><td><b>Изменения</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1044"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
@@ -44362,7 +44425,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1068"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
