--- a/i18n/eric5_ru.ts Thu Sep 08 19:38:39 2011 +0200
+++ b/i18n/eric5_ru.ts Fri Sep 09 09:33:19 2011 +0200
@@ -15587,17 +15587,17 @@
<translation type="obsolete">Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
@@ -15617,132 +15617,132 @@
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/>
- <source>Enter branch name</source>
- <translation>Введите имя ветви</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/>
+ <source>Enter branch name</source>
+ <translation>Введите имя ветви</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/>
<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="2254"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2290"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
<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="2335"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2346"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -15752,17 +15752,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2486"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
<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="2486"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -23871,28 +23871,44 @@
<translation>Обновлять рабочий каталог после загрузки</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/>
<source>Edit the Mercurial configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/>
<source>Edit configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/>
+ <source>Cleanup</source>
+ <translation type="unfinished">Очистка</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/>
+ <source>Pattern:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/>
+ <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="159"/>
+ <source>Select to prefer unbundle over pull</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/>
- <source>Cleanup</source>
- <translation type="unfinished">Очистка</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="168"/>
- <source>Pattern:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="175"/>
- <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
+ <source><b>Prefer Unbundle</b>
+<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="166"/>
+ <source>Prefer Unbundle</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -49271,17 +49287,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/>
<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="1695"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/>
<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="1702"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/>
<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>
@@ -49292,18 +49308,18 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/>
<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="1683"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1694"/>
<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="1699"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation>
</message>
@@ -49342,7 +49358,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
