--- a/i18n/eric5_ru.ts Mon May 30 19:23:59 2011 +0200
+++ b/i18n/eric5_ru.ts Mon May 30 19:50:55 2011 +0200
@@ -15395,32 +15395,32 @@
<translation>Слияние</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/>
<source>Mercurial Log</source>
<translation>лог</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/>
<source>Select number of entries to show.</source>
<translation>Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1473"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1505"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1504"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1619"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
@@ -15435,137 +15435,137 @@
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/>
<source>Enter branch name</source>
<translation>Введите имя ветви</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1652"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1755"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1754"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1824"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1849"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/>
<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="2118"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2021"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2000"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/>
<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="2199"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -23217,15 +23217,30 @@
<translation>Обновлять рабочий каталог после загрузки</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/>
<source>Edit the Mercurial configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="188"/>
<source>Edit configuration file</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>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageBoxWizard</name>
@@ -48151,17 +48166,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/>
<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="1576"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1575"/>
<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="1583"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1582"/>
<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>
@@ -48172,30 +48187,30 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/>
<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="1564"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1563"/>
<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="1580"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/>
<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="1096"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/>
<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="1112"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
<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>
@@ -48205,7 +48220,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1136"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1135"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -48222,7 +48237,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
