--- a/i18n/eric5_ru.ts Wed Aug 31 19:28:49 2011 +0200
+++ b/i18n/eric5_ru.ts Wed Aug 31 19:35:11 2011 +0200
@@ -1377,62 +1377,62 @@
<context>
<name>Bookmarks</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/>
<source>Delete Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/>
<source>Pull Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/>
<source>Push Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
@@ -15487,250 +15487,270 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/>
<source>The hg process finished with the exit code {0}</source>
<translation>Процесс hg завершился с кодом возврата {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/>
<source>Create project repository</source>
<translation>Создать репозиторий проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/>
<source>The project repository could not be created.</source>
<translation>Не могу создать репозиторий проекта.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/>
- <source>Creating Mercurial repository</source>
- <translation>Создание репозитория</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/>
+ <source>Creating Mercurial repository</source>
+ <translation>Создание репозитория</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/>
<source>Initial commit to Mercurial repository</source>
<translation>Первичная подача в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Создание копии репозитория</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/>
<source>Commiting changes to Mercurial repository</source>
- <translation>Подача изменений в репозиторий</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/>
+ <translation type="obsolete">Подача изменений в репозиторий</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Синхронизация с репозиторием</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Добавление файлов/каталогов в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Удаление файлов/каталогов из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/>
<source>Renaming {0}</source>
<translation>Переименование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/>
<source>Merging</source>
<translation>Слияние</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/>
<source>Mercurial Log</source>
<translation>лог</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/>
<source>Select number of entries to show.</source>
<translation>Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/>
<source>Taging in the Mercurial repository</source>
<translation>Создание меток в репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/>
<source>Reverting changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/>
<source>Enter branch name</source>
<translation>Введите имя ветви</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <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="2091"/>
- <source>Mercurial Bisect ({0})</source>
- <translation>Mercurial Bisect ({0})</translation>
- </message>
- <message>
- <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="1829"/>
- <source>Identifying project directory</source>
- <translation>Каталог проекта</translation>
- </message>
- <message>
- <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="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="2123"/>
- <source>Removing files from the Mercurial repository only</source>
- <translation>Удаление файлов только из репозитория</translation>
- </message>
- <message>
- <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="2026"/>
- <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
- <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
- </message>
- <message>
- <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="2179"/>
- <source>Backing out changeset</source>
- <translation>Отмена изменений</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/>
+ <source>Bisect subcommand ({0}) invalid.</source>
+ <translation>Неправильная подкоманда ({0}) для Bisect.</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/>
+ <source>Mercurial Bisect ({0})</source>
+ <translation>Mercurial Bisect ({0})</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/>
+ <source>Preview changegroup</source>
+ <translation>Предпросмотр группы изменений</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
+ <source>Identifying project directory</source>
+ <translation>Каталог проекта</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/>
+ <source>Create .hgignore file</source>
+ <translation>Создать файл .hgignore</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/>
+ <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="2225"/>
+ <source>Removing files from the Mercurial repository only</source>
+ <translation>Удаление файлов только из репозитория</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
+ <source>Mercurial Changegroup Files (*.hg)</source>
+ <translation>Mercurial файлы изменений (*.hg)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/>
+ <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
+ <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/>
+ <source>Identifying changegroup file</source>
+ <translation>Файлы изменений</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/>
+ <source>Backing out changeset</source>
+ <translation>Отмена изменений</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/>
<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="2204"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/>
+ <source>Committing changes to Mercurial repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
+ <source>Mercurial Command Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/>
+ <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
+ <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAnnotateDialog</name>
@@ -15810,12 +15830,12 @@
<translation>Alt+P</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
@@ -16188,17 +16208,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/>
<source>Process Generation Error</source>
<translation type="unfinished">Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/>
<source>no bookmarks found</source>
<translation type="unfinished"></translation>
</message>
@@ -16288,17 +16308,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/>
<source>Process Generation Error</source>
<translation type="unfinished">Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="131"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/>
<source>no bookmarks defined</source>
<translation type="unfinished"></translation>
</message>
@@ -16417,6 +16437,44 @@
</message>
</context>
<context>
+ <name>HgClient</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/>
+ <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/>
+ <source>Did not receive the 'hello' message.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/>
+ <source>Received data on unexpected channel.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/>
+ <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/>
+ <source>'capabilities' message did not contain any capability.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/>
+ <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/>
+ <source>'encoding' message did not contain any encoding.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgCommandDialog</name>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/>
@@ -16633,12 +16691,12 @@
<translation>Alt+П</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
@@ -16706,42 +16764,42 @@
<translation>Alt+П</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="178"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/>
<source>There is no difference.</source>
<translation>Различий нет.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/>
<source>Save Diff</source>
<translation>Сохранить изменения</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/>
<source>Patch Files (*.diff)</source>
<translation>Файлы изменений (*.diff)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Файл изменений <b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="109"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/>
<source>Patch Contents</source>
<translation type="unfinished"></translation>
</message>
@@ -16940,7 +16998,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/>
<source>Revision</source>
<translation type="unfinished">Версия (ревизия)</translation>
</message>
@@ -17015,17 +17073,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/>
<source>Process Generation Error</source>
<translation type="unfinished">Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="128"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/>
<source>no signatures found</source>
<translation type="unfinished"></translation>
</message>
@@ -17063,17 +17121,17 @@
<translation>Задайте поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/>
<source>Revision</source>
<translation>Версия (ревизия)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/>
<source>Author</source>
<translation>Автор</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/>
<source>Message</source>
<translation>Сообщение</translation>
</message>
@@ -17189,27 +17247,27 @@
<translation>Alt+П</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/>
<source>Added</source>
<translation>Добавлено</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/>
<source>Deleted</source>
<translation>Удалено</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/>
<source>Modified</source>
<translation>Изменено</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
@@ -17224,17 +17282,17 @@
<translation>Метки</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="473"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/>
<source>Mercurial Error</source>
<translation>Ошибка Mercurial</translation>
</message>
@@ -17274,7 +17332,7 @@
<translation>Задайте ветвь, по которой фильтровать</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/>
<source>All</source>
<translation>Все</translation>
</message>
@@ -17289,7 +17347,7 @@
<translation>лог (исходящий)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/>
<source>Bookmarks</source>
<translation type="unfinished">Закладки</translation>
</message>
@@ -17377,115 +17435,115 @@
<translation>Alt+П</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/>
<source><b>Processing your request, please wait...</b></source>
<translation><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/>
<source>Revision</source>
<translation>Версия (ревизия)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/>
<source>No log available for '{0}'</source>
<translation>Отсутствует журнальная записть для '{0}'</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/>
<source>diff to {0}</source>
<translation>Сравнить с {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/>
<source>Branches: {0}<br />
</source>
<translation>Ветви: {0}<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/>
<source>Tags: {0}<br />
</source>
<translation>Метки: {0}<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/>
<source>Parents: {0}<br />
</source>
<translation>Предки: {0}<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/>
<source><i>Author: {0}</i><br />
</source>
<translation><i>Автор: {0}</i><br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/>
<source><i>Date: {0}, {1}</i><br />
</source>
<translation><i>Дата: {0}, {1}</i><br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/>
<source>Added {0}<br />
</source>
<translation>Добавлено: {0}<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/>
<source>Modified {0}<br />
</source>
<translation>Изменено {0}<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/>
<source>Deleted {0}<br />
</source>
<translation>Удалено {0}<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/>
<source>Mercurial Error</source>
<translation>Ошибка Mercurial</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/>
<source>Added {0} (copied from {1})<br />
</source>
<translation>Добавлено {0} (скопировано из {1})<br />
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/>
<source>Bookmarks: {0}<br />
</source>
<translation type="unfinished"></translation>
@@ -18975,37 +19033,37 @@
<translation type="unfinished">Удалить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/>
<source>Unsaved Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/>
<source>The guards list has been changed. Shall the changes be applied?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/>
<source>Remove Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/>
<source>Do you really want to remove the selected guards?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/>
<source>Apply Guard Definitions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/>
<source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/>
<source>The Mercurial process did not finish in time.</source>
<translation type="unfinished"></translation>
</message>
@@ -19079,17 +19137,17 @@
<translation type="unfinished">Commit сообщение</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/>
<source>Process Generation Error</source>
<translation type="unfinished">Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/>
<source>Error: </source>
<translation type="unfinished"></translation>
</message>
@@ -19107,12 +19165,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/>
<source>Unguarded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/>
<source>no patches found</source>
<translation type="unfinished"></translation>
</message>
@@ -19197,42 +19255,42 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/>
<source>Process Generation Error</source>
<translation type="unfinished">Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/>
<source>no patches found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/>
<source>applied</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/>
- <source>guarded</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/>
+ <source>guarded</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/>
<source>missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/>
<source>unknown</source>
<translation type="unfinished">неизвестный</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/>
<source>not applied</source>
<translation type="unfinished"></translation>
</message>
@@ -19270,7 +19328,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/>
<source>Unguarded</source>
<translation type="unfinished"></translation>
</message>
@@ -19391,12 +19449,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/>
<source>Refresh</source>
<translation type="unfinished">Обновить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/>
<source>Press to refresh the queues list</source>
<translation type="unfinished"></translation>
</message>
@@ -19904,7 +19962,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/>
<source>Mercurial Status</source>
<translation>Mercurial Status</translation>
</message>
@@ -19981,107 +20039,107 @@
<translation>Нажмите, чтобы обновить отображение статуса</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/>
<source>Commit changes to repository...</source>
<translation>Зафиксировать изменения в репозитории...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/>
<source>Add to repository</source>
<translation>Добавить в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/>
<source>Revert changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/>
<source>Adjust column sizes</source>
<translation>Подстроить размеры колонок</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/>
<source>added</source>
<translation>добавлено</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/>
- <source>modified</source>
- <translation>изменено</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/>
- <source>removed</source>
- <translation>удалено</translation>
+ <source>modified</source>
+ <translation>изменено</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/>
- <source>not tracked</source>
- <translation>не отслеживается</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/>
- <source>normal</source>
- <translation>нормальный</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/>
- <source>ignored</source>
- <translation>игнорировано</translation>
+ <source>removed</source>
+ <translation>удалено</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/>
+ <source>not tracked</source>
+ <translation>не отслеживается</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/>
+ <source>normal</source>
+ <translation>нормальный</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/>
+ <source>ignored</source>
+ <translation>игнорировано</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/>
<source>missing</source>
<translation>отсутствует</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/>
<source>Commit</source>
<translation>Зафиксировать</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/>
<source>There are no uncommitted changes available/selected.</source>
<translation>Нет доступных/выбранных неотправленных изменений.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/>
<source>There are no unversioned entries available/selected.</source>
<translation>Нет/не выбраны неверсионные элементы.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/>
<source>Revert</source>
<translation>Откатить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/>
<source>Remove from repository</source>
<translation>Удалить из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/>
<source>Remove</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/>
<source>There are no missing entries available/selected.</source>
<translation>Нет/не выбраны пропущенных элементы.</translation>
</message>
@@ -20156,17 +20214,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/>
<source>Show differences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/>
<source>Restore missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/>
<source>all</source>
<translation type="unfinished"></translation>
</message>
@@ -20176,12 +20234,12 @@
<translation type="obsolete">Различие</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/>
<source>There are no entries selected to be committed.</source>
<translation type="unfinished"></translation>
</message>
@@ -20189,12 +20247,12 @@
<context>
<name>HgStatusMonitorThread</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/>
<source>Mercurial status checked successfully</source>
<translation>Статус Mercurial успешно проверен</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/>
<source>Could not start the Mercurial process.</source>
<translation>Невозможно запустить процесс Mercurial.</translation>
</message>
@@ -20286,32 +20344,32 @@
<translation>Alt+П</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/>
<source>Mercurial Branches List</source>
<translation>Список ветвей</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/>
<source>Status</source>
<translation>Статус</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/>
<source>Process Generation Error</source>
<translation>Ошибка процесса генерации</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/>
<source>active</source>
<translation>активный</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/>
<source>yes</source>
<translation>да</translation>
</message>
@@ -27222,12 +27280,12 @@
<translation>Создать каталог проекта</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2882"/>
+ <location filename="Project/Project.py" line="2887"/>
<source>Open project</source>
<translation>Открыть проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2916"/>
+ <location filename="Project/Project.py" line="2921"/>
<source>Save project as</source>
<translation>Сохранить проект как</translation>
</message>
@@ -27247,162 +27305,162 @@
<translation>Изменения в текущем проекте не сохранены.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3059"/>
+ <location filename="Project/Project.py" line="3064"/>
<source>&Save</source>
<translation>&Сохранить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2869"/>
+ <location filename="Project/Project.py" line="2874"/>
<source>New project</source>
<translation>Новый проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2869"/>
- <source>&New...</source>
- <translation>&Новый...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="2873"/>
- <source>Generate a new project</source>
- <translation>Создать новый проект</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="2874"/>
+ <source>&New...</source>
+ <translation>&Новый...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="2878"/>
+ <source>Generate a new project</source>
+ <translation>Создать новый проект</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="2879"/>
<source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source>
<translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом проекте.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2882"/>
- <source>&Open...</source>
- <translation>&Открыть...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="2886"/>
- <source>Open an existing project</source>
- <translation>Открыть существующий проект</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="2887"/>
+ <source>&Open...</source>
+ <translation>&Открыть...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="2891"/>
+ <source>Open an existing project</source>
+ <translation>Открыть существующий проект</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="2892"/>
<source><b>Open...</b><p>This opens an existing project.</p></source>
<translation><b>Открыть...</b><p>Открыть существующий проект.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2894"/>
+ <location filename="Project/Project.py" line="2899"/>
<source>Close project</source>
<translation>Закрыть проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2894"/>
+ <location filename="Project/Project.py" line="2899"/>
<source>&Close</source>
<translation>&Закрыть</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2897"/>
+ <location filename="Project/Project.py" line="2902"/>
<source>Close the current project</source>
<translation>Закрыть текущий проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2898"/>
+ <location filename="Project/Project.py" line="2903"/>
<source><b>Close</b><p>This closes the current project.</p></source>
<translation><b>Закрыть</b><p>Закрыть текущий проект.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2905"/>
+ <location filename="Project/Project.py" line="2910"/>
<source>Save project</source>
<translation>Сохранить проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2908"/>
+ <location filename="Project/Project.py" line="2913"/>
<source>Save the current project</source>
<translation>Сохранить текущий проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2909"/>
+ <location filename="Project/Project.py" line="2914"/>
<source><b>Save</b><p>This saves the current project.</p></source>
<translation><b>Сохранить</b><p>Сохранить текущий проект.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2916"/>
+ <location filename="Project/Project.py" line="2921"/>
<source>Save &as...</source>
<translation>Сохранить &как...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2919"/>
+ <location filename="Project/Project.py" line="2924"/>
<source>Save the current project to a new file</source>
<translation>Сохранить текущий проект в новый файл</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2920"/>
+ <location filename="Project/Project.py" line="2925"/>
<source><b>Save as</b><p>This saves the current project to a new file.</p></source>
<translation><b>Сохранить как</b><p> Сохранить текущий проект в новый файл.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2957"/>
+ <location filename="Project/Project.py" line="2962"/>
<source>Add translation to project</source>
<translation>Добавить перевод в проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2957"/>
+ <location filename="Project/Project.py" line="2962"/>
<source>Add &translation...</source>
<translation>Добавить &перевод...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2961"/>
+ <location filename="Project/Project.py" line="2966"/>
<source>Add a translation to the current project</source>
<translation>Добавить перевод в текущий проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2963"/>
+ <location filename="Project/Project.py" line="2968"/>
<source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source>
<translation><b>Добавить перевод...</b><p>Открыть диалог для добавления перевода в текущий проект.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2971"/>
+ <location filename="Project/Project.py" line="2976"/>
<source>Search new files</source>
<translation>Поиск новых файлов</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2971"/>
+ <location filename="Project/Project.py" line="2976"/>
<source>Searc&h new files...</source>
<translation>Поис&к новых файлов...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2974"/>
+ <location filename="Project/Project.py" line="2979"/>
<source>Search new files in the project directory.</source>
<translation>Поиск новых файлов в каталоге проекта.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2983"/>
+ <location filename="Project/Project.py" line="2988"/>
<source>Project properties</source>
<translation>Свойства проекта</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2983"/>
+ <location filename="Project/Project.py" line="2988"/>
<source>&Properties...</source>
<translation>&Свойства...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2986"/>
+ <location filename="Project/Project.py" line="2991"/>
<source>Show the project properties</source>
<translation>Показать свойства проекта</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2987"/>
+ <location filename="Project/Project.py" line="2992"/>
<source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source>
<translation><b>Свойства...</b><p>Показать диалог для редактирования свойств проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3095"/>
+ <location filename="Project/Project.py" line="3100"/>
<source>Load session</source>
<translation>Загрузить сессию</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3098"/>
+ <location filename="Project/Project.py" line="3103"/>
<source>Load the projects session file.</source>
<translation>Загрузить файл с сессией проекта.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3099"/>
+ <location filename="Project/Project.py" line="3104"/>
<source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source>
<translation><b>Загрузить сессию</b>
<p>Загрузить файл с сессией проекта. Сессия содержит следующие данные:<br>
@@ -27414,17 +27472,17 @@
</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3112"/>
+ <location filename="Project/Project.py" line="3117"/>
<source>Save session</source>
<translation>Сохранить сессию</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3115"/>
+ <location filename="Project/Project.py" line="3120"/>
<source>Save the projects session file.</source>
<translation>Сохранить файл с сессией проекта.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3116"/>
+ <location filename="Project/Project.py" line="3121"/>
<source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source>
<translation><b>Сохранить сессию</b>
<p>Сохранить файл с сессией проекта. Сессия содержит следующие данные:<br>
@@ -27436,137 +27494,137 @@
</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3142"/>
+ <location filename="Project/Project.py" line="3147"/>
<source>Code Metrics</source>
<translation>Статистика кода</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3142"/>
- <source>&Code Metrics...</source>
- <translation>&Статистика кода...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3145"/>
- <source>Show some code metrics for the project.</source>
- <translation>Отображает статистику кода для проекта.</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3147"/>
+ <source>&Code Metrics...</source>
+ <translation>&Статистика кода...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3150"/>
+ <source>Show some code metrics for the project.</source>
+ <translation>Отображает статистику кода для проекта.</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3152"/>
<source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source>
<translation><b>Статистика кода...</b><p>Отображает статистику кода для проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3154"/>
- <source>Python Code Coverage</source>
- <translation>Охват кода Python</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3154"/>
- <source>Code Co&verage...</source>
- <translation>&Заключения по коду...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3157"/>
- <source>Show code coverage information for the project.</source>
- <translation>Показать заключение охвата по коду проекта.</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3159"/>
+ <source>Python Code Coverage</source>
+ <translation>Охват кода Python</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3159"/>
+ <source>Code Co&verage...</source>
+ <translation>&Заключения по коду...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3162"/>
+ <source>Show code coverage information for the project.</source>
+ <translation>Показать заключение охвата по коду проекта.</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3164"/>
<source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source>
<translation><b>Заключение охвата по коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3839"/>
+ <location filename="Project/Project.py" line="3844"/>
<source>Profile Data</source>
<translation>Данные профайлера</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3167"/>
- <source>&Profile Data...</source>
- <translation>&Данные профайлера...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3170"/>
- <source>Show profiling data for the project.</source>
- <translation>Отображает результаты профилирования проекта.</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3172"/>
+ <source>&Profile Data...</source>
+ <translation>&Данные профайлера...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3175"/>
+ <source>Show profiling data for the project.</source>
+ <translation>Отображает результаты профилирования проекта.</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3177"/>
<source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source>
<translation><b>Данные профайлера...</b><p>Отображает результаты профилирования проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3257"/>
+ <location filename="Project/Project.py" line="3262"/>
<source>Open &Recent Projects</source>
<translation>Открыть &недавние проекты</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3261"/>
- <source>Chec&k</source>
- <translation>&Проверки</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3263"/>
- <source>Sho&w</source>
- <translation>По&казать</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3266"/>
+ <source>Chec&k</source>
+ <translation>&Проверки</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3268"/>
+ <source>Sho&w</source>
+ <translation>По&казать</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3271"/>
<source>Source &Documentation</source>
<translation>&Документация исходников</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3542"/>
+ <location filename="Project/Project.py" line="3547"/>
<source>Search New Files</source>
<translation>Поиск новых файлов</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3542"/>
+ <location filename="Project/Project.py" line="3547"/>
<source>There were no new files found to be added.</source>
<translation>Не найдено файлов для добавления.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3680"/>
+ <location filename="Project/Project.py" line="3685"/>
<source>Version Control System</source>
<translation>Система контроля версий</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3818"/>
+ <location filename="Project/Project.py" line="3823"/>
<source>There is no main script defined for the current project. Aborting</source>
<translation>Для текущего проекта не определён главный сценарий. Отмена</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3258"/>
+ <location filename="Project/Project.py" line="3263"/>
<source>&Version Control</source>
<translation>Контроль &версий</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3772"/>
+ <location filename="Project/Project.py" line="3777"/>
<source>Coverage Data</source>
<translation>Данные охвата</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3892"/>
+ <location filename="Project/Project.py" line="3897"/>
<source>Application Diagram</source>
<translation>Диаграмма приложения</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3179"/>
- <source>&Application Diagram...</source>
- <translation>&Диаграмма приложения...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3182"/>
- <source>Show a diagram of the project.</source>
- <translation>Показать диаграмму проекта.</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3184"/>
+ <source>&Application Diagram...</source>
+ <translation>&Диаграмма приложения...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3187"/>
+ <source>Show a diagram of the project.</source>
+ <translation>Показать диаграмму проекта.</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3189"/>
<source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source>
<translation><b>Диаграмма приложения...</b><p>Отображает диаграмму проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3264"/>
+ <location filename="Project/Project.py" line="3269"/>
<source>&Diagrams</source>
<translation>&Диаграммы</translation>
</message>
@@ -27576,37 +27634,37 @@
<translation>Сохранить файл проекта</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3793"/>
+ <location filename="Project/Project.py" line="3798"/>
<source>Code Coverage</source>
<translation>Заключения охвата по коду</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3793"/>
+ <location filename="Project/Project.py" line="3798"/>
<source>Please select a coverage file</source>
<translation>Пожалуйста, выберите файл для информации охвата</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3839"/>
+ <location filename="Project/Project.py" line="3844"/>
<source>Please select a profile file</source>
<translation>Пожалуйста, выберите файл профиля</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2943"/>
+ <location filename="Project/Project.py" line="2948"/>
<source>Add directory to project</source>
<translation>Добавить каталог в проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2943"/>
+ <location filename="Project/Project.py" line="2948"/>
<source>Add directory...</source>
<translation>Добавить каталог...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2947"/>
+ <location filename="Project/Project.py" line="2952"/>
<source>Add a directory to the current project</source>
<translation>Добавить каталог в текущий проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2949"/>
+ <location filename="Project/Project.py" line="2954"/>
<source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source>
<translation><b>Добавить каталог...</b>
<p>Открыть диалог для добавления каталога в текущий проект.</p></translation>
@@ -27697,17 +27755,17 @@
<translation><p>Невозможно удалить выбранный файл с сессией: <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3129"/>
+ <location filename="Project/Project.py" line="3134"/>
<source>Delete session</source>
<translation>Удалить сессию</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3132"/>
+ <location filename="Project/Project.py" line="3137"/>
<source>Delete the projects session file.</source>
<translation>Удалить файл с сессией проекта.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3133"/>
+ <location filename="Project/Project.py" line="3138"/>
<source><b>Delete session</b><p>This deletes the projects session file</p></source>
<translation><b>Удалить сессию</b><p>Удалить файл с сессией проекта</p></translation>
</message>
@@ -27717,7 +27775,7 @@
<translation>Исходники на Ruby (*.rb);;</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2975"/>
+ <location filename="Project/Project.py" line="2980"/>
<source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source>
<translation><b>Искать новые файлы...</b><p>Поиск новых файлов (исходников, *.ui, *.idl) в каталоге проекта и зарегистрированных подкаталогах.</p></translation>
</message>
@@ -27732,7 +27790,7 @@
<translation>Другое</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3892"/>
+ <location filename="Project/Project.py" line="3897"/>
<source>Include module names?</source>
<translation>Включать имена модулей?</translation>
</message>
@@ -27797,155 +27855,155 @@
<translation><p>Невозможно удалить файл свойств отладчика <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3037"/>
+ <location filename="Project/Project.py" line="3042"/>
<source>Debugger Properties</source>
<translation>Свойства отладчика</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3037"/>
+ <location filename="Project/Project.py" line="3042"/>
<source>Debugger &Properties...</source>
<translation>&Свойства отладчика...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3040"/>
+ <location filename="Project/Project.py" line="3045"/>
<source>Show the debugger properties</source>
<translation>Показать свойства отладчика</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3041"/>
+ <location filename="Project/Project.py" line="3046"/>
<source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source>
<translation><b>Свойства отладчика...</b>
<p>Показать диалог для редактирования свойств отладчика, специфичных для данного проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3048"/>
+ <location filename="Project/Project.py" line="3053"/>
<source>Load</source>
<translation>Загрузить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3048"/>
+ <location filename="Project/Project.py" line="3053"/>
<source>&Load</source>
<translation>&Загрузить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3051"/>
+ <location filename="Project/Project.py" line="3056"/>
<source>Load the debugger properties</source>
<translation>Загрузить свойства отладчика</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3059"/>
+ <location filename="Project/Project.py" line="3064"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3062"/>
+ <location filename="Project/Project.py" line="3067"/>
<source>Save the debugger properties</source>
<translation>Сохранить свойства отладчика</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3070"/>
+ <location filename="Project/Project.py" line="3075"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3070"/>
+ <location filename="Project/Project.py" line="3075"/>
<source>&Delete</source>
<translation>&Удалить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3073"/>
+ <location filename="Project/Project.py" line="3078"/>
<source>Delete the debugger properties</source>
<translation>Удалить свойства отладчика</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3082"/>
+ <location filename="Project/Project.py" line="3087"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3082"/>
+ <location filename="Project/Project.py" line="3087"/>
<source>&Reset</source>
<translation>&Сбросить</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3085"/>
+ <location filename="Project/Project.py" line="3090"/>
<source>Reset the debugger properties</source>
<translation>Сбросить свойства отладчика</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3268"/>
+ <location filename="Project/Project.py" line="3273"/>
<source>Debugger</source>
<translation>Отладчик</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3265"/>
+ <location filename="Project/Project.py" line="3270"/>
<source>Session</source>
<translation>Сессия</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3052"/>
+ <location filename="Project/Project.py" line="3057"/>
<source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source>
<translation><b>Загрузить свойства отладчика</b>
<p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3063"/>
+ <location filename="Project/Project.py" line="3068"/>
<source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source>
<translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3074"/>
+ <location filename="Project/Project.py" line="3079"/>
<source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source>
<translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3086"/>
+ <location filename="Project/Project.py" line="3091"/>
<source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source>
<translation><b>Сбросить свойства отладчика</b><p>Сбросить свойства отладчика, специфичные для данного проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3006"/>
+ <location filename="Project/Project.py" line="3011"/>
<source>Filetype Associations</source>
<translation>Ассоциации для типа файла</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3006"/>
- <source>Filetype Associations...</source>
- <translation>Ассоциации для типа файла...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3009"/>
- <source>Show the project filetype associations</source>
- <translation>Показать ассоциации типов файлов для проекта</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3011"/>
+ <source>Filetype Associations...</source>
+ <translation>Ассоциации для типа файла...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3014"/>
+ <source>Show the project filetype associations</source>
+ <translation>Показать ассоциации типов файлов для проекта</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3016"/>
<source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source>
<translation><b>Ассоциации типов файлов...</b>
<p>Показать диалог для редактирования ассоциаций типов файлов для проекта. Эти ассоциации связывают тип файла (исходник, форма, интерфейс и т.д.) с шаблоном имени. Они используются при добавлении файлов в проект и при поиске новых файлов.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3269"/>
+ <location filename="Project/Project.py" line="3274"/>
<source>Pac&kagers</source>
<translation>У&паковщики</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2929"/>
+ <location filename="Project/Project.py" line="2934"/>
<source>Add files to project</source>
<translation>Добавить файлы в проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2929"/>
- <source>Add &files...</source>
- <translation>Добавить &файлы...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="2933"/>
- <source>Add files to the current project</source>
- <translation>Добавить файлы в текущий проект</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="2934"/>
+ <source>Add &files...</source>
+ <translation>Добавить &файлы...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="2938"/>
+ <source>Add files to the current project</source>
+ <translation>Добавить файлы в текущий проект</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="2939"/>
<source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source>
<translation><b>Добавить файлы</b>
<p>Открывает диалог для добавления файлов в текущий проект. Место добавления определяется расширением файла.</p></translation>
@@ -27971,17 +28029,17 @@
<translation>Файлы проектов (*.e4p)</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3256"/>
+ <location filename="Project/Project.py" line="3261"/>
<source>&Project</source>
<translation>&Проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3371"/>
+ <location filename="Project/Project.py" line="3376"/>
<source>Project</source>
<translation>Проект</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3432"/>
+ <location filename="Project/Project.py" line="3437"/>
<source>&Clear</source>
<translation>&Очистить</translation>
</message>
@@ -28011,22 +28069,22 @@
<translation><p>Невозможно записать файл пользовательских настроек <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="2994"/>
+ <location filename="Project/Project.py" line="2999"/>
<source>User project properties</source>
<translation>Пользовательские настройки проекта</translation>
</message>
<message>
- <location filename="Project/Project.py" line="2994"/>
- <source>&User Properties...</source>
- <translation>&Пользовательские свойства...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="2997"/>
- <source>Show the user specific project properties</source>
- <translation>Показать пользовательские свойства проекта</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="2999"/>
+ <source>&User Properties...</source>
+ <translation>&Пользовательские свойства...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3002"/>
+ <source>Show the user specific project properties</source>
+ <translation>Показать пользовательские свойства проекта</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3004"/>
<source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source>
<translation><b>Пользовательские свойства...</b>
<p>Отображает диалог для редактирования пользовательских свойств проекта.</p></translation>
@@ -28046,47 +28104,47 @@
</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4023"/>
+ <location filename="Project/Project.py" line="4028"/>
<source>Create Package List</source>
<translation>Создать список пакетов</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3193"/>
+ <location filename="Project/Project.py" line="3198"/>
<source>Create &Package List</source>
<translation>&Создать список пакетов</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4183"/>
+ <location filename="Project/Project.py" line="4188"/>
<source>Create Plugin Archive</source>
<translation>Создать архив подключаемого модуля</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3207"/>
+ <location filename="Project/Project.py" line="3212"/>
<source>Create Plugin &Archive</source>
<translation>Создать &архив плагина</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3996"/>
+ <location filename="Project/Project.py" line="4001"/>
<source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source>
<translation><p>Файл <b>PKGLIST</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4023"/>
+ <location filename="Project/Project.py" line="4028"/>
<source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source>
<translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4040"/>
+ <location filename="Project/Project.py" line="4045"/>
<source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source>
<translation><p>Файл <b>PKGLIST</b> не существует. Отмена...</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4048"/>
+ <location filename="Project/Project.py" line="4053"/>
<source>The project does not have a main script defined. Aborting...</source>
<translation>Для текущего проекта не определён главный сценарий. Отмена...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4060"/>
+ <location filename="Project/Project.py" line="4065"/>
<source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source>
<translation><p>Невозможно прочитать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation>
</message>
@@ -28116,22 +28174,22 @@
<translation><p>Тип проекта <b>{0}</b> уже существует.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4091"/>
+ <location filename="Project/Project.py" line="4096"/>
<source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source>
<translation><p>Невозможно сохранить в архив файл <b>{0}</b>. Игнорируем его.</p><p>Причина: {1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3222"/>
+ <location filename="Project/Project.py" line="3227"/>
<source>Create Plugin Archive (Snapshot)</source>
<translation>Создать архив плагинов (снимок)</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3222"/>
+ <location filename="Project/Project.py" line="3227"/>
<source>Create Plugin Archive (&Snapshot)</source>
<translation>Создать архив плагинов (&снимок)</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4183"/>
+ <location filename="Project/Project.py" line="4188"/>
<source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation>
</message>
@@ -28151,32 +28209,32 @@
<translation>Введите образец имени файла для переводов (используйте '%language%' вместо кода языка):</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3671"/>
+ <location filename="Project/Project.py" line="3676"/>
<source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source>
<translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Отмена.</p><p>{1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3680"/>
+ <location filename="Project/Project.py" line="3685"/>
<source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source>
<translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Контроль версий не используется.</p><p>{1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3021"/>
- <source>Lexer Associations</source>
- <translation>Ассоциации для лексеров</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3021"/>
- <source>Lexer Associations...</source>
- <translation>Ассоциации для лексеров...</translation>
- </message>
- <message>
- <location filename="Project/Project.py" line="3024"/>
- <source>Show the project lexer associations (overriding defaults)</source>
- <translation>Показать ассоциации для лексеров</translation>
- </message>
- <message>
<location filename="Project/Project.py" line="3026"/>
+ <source>Lexer Associations</source>
+ <translation>Ассоциации для лексеров</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3026"/>
+ <source>Lexer Associations...</source>
+ <translation>Ассоциации для лексеров...</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3029"/>
+ <source>Show the project lexer associations (overriding defaults)</source>
+ <translation>Показать ассоциации для лексеров</translation>
+ </message>
+ <message>
+ <location filename="Project/Project.py" line="3031"/>
<source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source>
<translation><b>Ассоциации для лексеров...</b><p>Показать ассоциации лексеров для проекта. Лексеры используются для подсвечивания текста в редакторе.</p></translation>
</message>
@@ -28201,42 +28259,42 @@
<translation>Подключаемый модуль Eric</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3197"/>
+ <location filename="Project/Project.py" line="3202"/>
<source>Create an initial PKGLIST file for an eric5 plugin.</source>
<translation>Создать начальный файл PKGLIST для подключаемого модуля eric5.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3199"/>
+ <location filename="Project/Project.py" line="3204"/>
<source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source>
<translation><b>Создать список пакетов</b><p>Создаёт начальный список файлов для включения в архив подключаемого модуля eric5. Список создаётся из файла проекта.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3211"/>
+ <location filename="Project/Project.py" line="3216"/>
<source>Create an eric5 plugin archive file.</source>
<translation>Создать архив подключаемого модуля eric5.</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3213"/>
+ <location filename="Project/Project.py" line="3218"/>
<source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source>
<translation><b>Создать архив подключаемого модуля</b><p>Создаёт файл арива подключаемого модуля eric5, используя список файлов, данный в файле PKGLIST. Имя архива берётся из имени главного сценария.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3226"/>
+ <location filename="Project/Project.py" line="3231"/>
<source>Create an eric5 plugin archive file (snapshot release).</source>
<translation>Создать файл архива плагинов eric5 (снимок выпуска).</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3228"/>
+ <location filename="Project/Project.py" line="3233"/>
<source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source>
<translation><b>Создать файл архива плагинов (снимок выпуска)</b><p>Создаёт файл архива плагинов eric5, используя список файлов, указанный в файле PKGLIST. Имя архива строится из имени главного сценария. Версия главного сценария меняется, чтобы соответствовать версии выпуска снимка.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4071"/>
+ <location filename="Project/Project.py" line="4076"/>
<source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source>
<translation><p>Невозможно создать подключаемый модуль eric5 <b>{0}</b>.</p><p>Причина: {1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4103"/>
+ <location filename="Project/Project.py" line="4108"/>
<source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source>
<translation><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p></translation>
</message>
@@ -29919,22 +29977,22 @@
<context>
<name>Purge</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/>
<source>Purge All Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/>
<source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/>
<source>Purge Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/>
<source>Do really want to delete files not tracked by Mercurial?</source>
<translation type="unfinished"></translation>
</message>
@@ -31949,177 +32007,177 @@
<context>
<name>Queues</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/>
<source>New Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/>
<source>Update Current Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/>
- <source>Pop Patches</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/>
- <source>Push Patches</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/>
- <source>Go to Patch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/>
- <source>Select Patch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/>
+ <source>Pop Patches</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/>
+ <source>Push Patches</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/>
+ <source>Go to Patch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/>
+ <source>Select Patch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/>
<source>Select the target patch name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/>
<source>No patches to select from.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/>
<source>Finish Applied Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/>
<source>Rename Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/>
<source>Select the patch to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/>
<source>Delete Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/>
<source>Fold Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/>
<source>No patches selected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/>
<source>No patches available to be folded.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/>
<source>List Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/>
<source>No patches available to list guards for.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/>
- <source>Define Guards</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/>
- <source>No patches available to define guards for.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/>
- <source>Drop All Guards</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/>
+ <source>Define Guards</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/>
+ <source>No patches available to define guards for.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/>
+ <source>Drop All Guards</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/>
<source>Select the patch to drop guards for (leave empty for the current patch):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/>
<source>Set Active Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/>
<source>No guards available to select from.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/>
<source>Deactivate Guards</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/>
<source>Create New Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/>
<source>Rename Active Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/>
- <source>Error while creating a new queue.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/>
- <source>Error while renaming the active queue.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/>
- <source>Purge Queue</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/>
+ <source>Error while creating a new queue.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/>
+ <source>Error while renaming the active queue.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/>
+ <source>Purge Queue</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/>
<source>Delete Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/>
<source>Activate Queue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/>
<source>Error while purging the queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/>
<source>Error while deleting the queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/>
<source>Error while setting the active queue.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/>
<source>Available Queues</source>
<translation type="unfinished"></translation>
</message>
@@ -49025,17 +49083,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/>
<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="1580"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/>
<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="1587"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/>
<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>
@@ -49046,30 +49104,30 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/>
<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="1568"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/>
<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="1584"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/>
<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="1100"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/>
<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="1116"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/>
<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>
@@ -49079,7 +49137,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -49096,7 +49154,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
