--- a/i18n/eric5_ru.ts Sun Mar 27 18:07:50 2011 +0200 +++ b/i18n/eric5_ru.ts Sun Mar 27 19:04:42 2011 +0200 @@ -14855,12 +14855,12 @@ <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1464"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -14880,122 +14880,122 @@ <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1483"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1486"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1483"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1486"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1497"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1592"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1615"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1520"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1865"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1868"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1661"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1686"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1686"/> <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="1938"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1730"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1851"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -16882,447 +16882,447 @@ <translation><b>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветвь</b><p>Закрыть ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключить</b><p>Переключить рабочий каталог на другую ревизию.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="493"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>Command options</source> <translation>Опции командной строки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>Command &options...</source> <translation>&Опции командной строки...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> <source>Show the Mercurial command options</source> <translation>Показать опции командной строки Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Edit repository config</source> <translation>Изменить настройки репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Edit repository config...</source> <translation>Изменить настройки репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show an editor to edit the repository config file</source> <translation>Изменить настройки репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> <translation><b>Изменить настройки репозитория</b><p>Изменить настройки репозитория во встроенном редакторе.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Show combined config settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Show combined config settings...</source> <translation>Показ комбинированных настроек...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> <source>Show the combined config settings from all config files</source> <translation>Показ комбинированных настроек из всех конфигурационных файлов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> <translation><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Skip</source> <translation>Пропустить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> <source>Skip the current changeset</source> <translation>Пропустить текущие изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Identify the project directory</source> <translation>Задайте каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Каталог проекта</b><p>Задайте каталог проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Identify changegroup</source> <translation>Выбрать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Identify changegroup...</source> <translation>Выбрать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Выбрать файл содержащий коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -17342,40 +17342,55 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="904"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="904"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -36847,129 +36862,129 @@ <context> <name>TaskViewer</name> <message> - <location filename="Tasks/TaskViewer.py" line="354"/> + <location filename="Tasks/TaskViewer.py" line="366"/> <source>Filename</source> <translation>Имя файла</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="354"/> + <location filename="Tasks/TaskViewer.py" line="366"/> <source>Line</source> <translation>Строка</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="387"/> + <location filename="Tasks/TaskViewer.py" line="399"/> <source>&Go To</source> <translation>&Перейти</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="389"/> + <location filename="Tasks/TaskViewer.py" line="401"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="416"/> + <location filename="Tasks/TaskViewer.py" line="428"/> <source>&Paste</source> <translation>Вс&тавить</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="391"/> + <location filename="Tasks/TaskViewer.py" line="403"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="393"/> + <location filename="Tasks/TaskViewer.py" line="405"/> <source>&Mark Completed</source> <translation>&Отметить как завершённую</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="419"/> + <location filename="Tasks/TaskViewer.py" line="431"/> <source>Delete Completed &Tasks</source> <translation>Удалить &завершённые задачи</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="412"/> + <location filename="Tasks/TaskViewer.py" line="424"/> <source>&New Task...</source> <translation>&Новая задача...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="398"/> + <location filename="Tasks/TaskViewer.py" line="410"/> <source>P&roperties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="423"/> + <location filename="Tasks/TaskViewer.py" line="435"/> <source>&Filtered display</source> <translation>&Фильтровать</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="427"/> + <location filename="Tasks/TaskViewer.py" line="439"/> <source>Filter c&onfiguration...</source> <translation>&Настройки фильтра...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="430"/> + <location filename="Tasks/TaskViewer.py" line="442"/> <source>Resi&ze columns</source> <translation>Изменить размер &колонок</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="726"/> + <location filename="Tasks/TaskViewer.py" line="738"/> <source>Activate task filter</source> <translation>Включить фильтр задач</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="726"/> + <location filename="Tasks/TaskViewer.py" line="738"/> <source>The task filter doesn't have any active filters. Do you want to configure the filter settings?</source> <translation>Фильтр задач не содержит ни одного активного фильтра. Настроить фильтры?</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="374"/> + <location filename="Tasks/TaskViewer.py" line="386"/> <source>&Regenerate project tasks</source> <translation>&Перегенерировать задачи проекта</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="784"/> + <location filename="Tasks/TaskViewer.py" line="796"/> <source>Extracting project tasks...</source> <translation>Извлечение задач проекта...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="784"/> + <location filename="Tasks/TaskViewer.py" line="796"/> <source>Abort</source> <translation>Отмена</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="790"/> + <location filename="Tasks/TaskViewer.py" line="802"/> <source>Extracting project tasks... {0}</source> <translation>Извлечение задач проекта... {0}</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="354"/> + <location filename="Tasks/TaskViewer.py" line="366"/> <source>Summary</source> <translation>Итого</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="432"/> + <location filename="Tasks/TaskViewer.py" line="444"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="378"/> + <location filename="Tasks/TaskViewer.py" line="390"/> <source>&Configure scan options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="755"/> + <location filename="Tasks/TaskViewer.py" line="767"/> <source>Scan Filter Patterns</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="755"/> + <location filename="Tasks/TaskViewer.py" line="767"/> <source>Enter filename patterns of files to be excluded separated by a comma:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Tasks/TaskViewer.py" line="372"/> + <location filename="Tasks/TaskViewer.py" line="384"/> <source>P&roject Tasks</source> <translation type="unfinished"></translation> </message> @@ -45127,17 +45142,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1417"/> <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="1418"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1421"/> <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="1425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1428"/> <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> @@ -45148,18 +45163,18 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> <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="1410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/> <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="1422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1425"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message>