--- a/i18n/eric5_ru.ts Sat Jun 02 15:27:03 2012 +0200
+++ b/i18n/eric5_ru.ts Sat Jun 02 16:36:16 2012 +0200
@@ -16905,7 +16905,7 @@
<translation>Слияние</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1368"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
@@ -16920,17 +16920,17 @@
<translation type="obsolete">Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1613"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1666"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1785"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
@@ -16945,137 +16945,137 @@
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1178"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/>
<source>Enter branch name</source>
<translation>Введите имя ветви</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2028"/>
<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="2305"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2307"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2363"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2343"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/>
<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="2386"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2383"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -17085,42 +17085,42 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/>
<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="2764"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2502"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
@@ -18035,7 +18035,7 @@
<location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/>
<source><b>Target name</b>
<p>Enter the new name in this field.</p></source>
- <translation><b>Куда</b>
+ <translation type="obsolete"><b>Куда</b>
<p>В этом поле задайте новое мия.</p></translation>
</message>
<message>
@@ -18059,10 +18059,16 @@
<translation>Mercurial Move</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="73"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="79"/>
<source>Select target</source>
<translation>Выберите цель</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/>
+ <source><b>Target name</b>
+<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgDialog</name>
@@ -19662,12 +19668,12 @@
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/>
<source>Copy in repository</source>
- <translation>Копировать в репозитории</translation>
+ <translation type="obsolete">Копировать в репозитории</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/>
<source>Move in repository</source>
- <translation>Переместить в репозитории</translation>
+ <translation type="obsolete">Переместить в репозитории</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/>
@@ -19754,6 +19760,16 @@
<source>Conflict resolved</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/>
+ <source>Copy</source>
+ <translation type="unfinished">Копировать</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/>
+ <source>Move</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgProjectHelper</name>
@@ -39854,7 +39870,7 @@
<translation>Перемещение Subversion</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="73"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="79"/>
<source>Select target</source>
<translation>Выберите цель</translation>
</message>
@@ -39906,7 +39922,7 @@
<location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/>
<source><b>Target name</b>
<p>Enter the new name in this field.</p></source>
- <translation><b>Куда</b>
+ <translation type="obsolete"><b>Куда</b>
<p>В этом поле задайте новое мия.</p></translation>
</message>
<message>
@@ -39930,6 +39946,12 @@
<p>Select the target name for the operation via a selection dialog.</p></source>
<translation><b>Назначение</b><p>Выберите имя назначения с помощью диалога выбора.</p></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/>
+ <source><b>Target name</b>
+<p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnDialog</name>
@@ -41005,12 +41027,12 @@
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/>
<source>Copy in repository</source>
- <translation>Копировать в репозиторий</translation>
+ <translation type="obsolete">Копировать в репозиторий</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/>
<source>Move in repository</source>
- <translation>Переместить в репозиторий</translation>
+ <translation type="obsolete">Переместить в репозиторий</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/>
@@ -41152,6 +41174,16 @@
<source>Conflict resolved</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/>
+ <source>Copy</source>
+ <translation type="unfinished">Копировать</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/>
+ <source>Move</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnProjectHelper</name>
@@ -50506,142 +50538,142 @@
<context>
<name>VcsProjectHelper</name>
<message>
- <location filename="VCS/ProjectHelper.py" line="65"/>
+ <location filename="VCS/ProjectHelper.py" line="67"/>
<source>New from repository</source>
<translation>Новый из репозитория</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="65"/>
- <source>&New from repository...</source>
- <translation>&Новый из репозитория...</translation>
- </message>
- <message>
<location filename="VCS/ProjectHelper.py" line="67"/>
+ <source>&New from repository...</source>
+ <translation>&Новый из репозитория...</translation>
+ </message>
+ <message>
+ <location filename="VCS/ProjectHelper.py" line="69"/>
<source>Create a new project from the VCS repository</source>
<translation>Создать новый проект из репозитория VCS</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="70"/>
+ <location filename="VCS/ProjectHelper.py" line="72"/>
<source><b>New from repository</b><p>This creates a new local project from the VCS repository.</p></source>
<translation><b>Новый из репозитория</b><p>Создать новый проект из репозитория VCS.</p></translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="77"/>
- <source>Export from repository</source>
- <translation>Экспорт из репозитория</translation>
- </message>
- <message>
- <location filename="VCS/ProjectHelper.py" line="77"/>
- <source>&Export from repository...</source>
- <translation>&Экспорт из репозитория...</translation>
- </message>
- <message>
<location filename="VCS/ProjectHelper.py" line="79"/>
+ <source>Export from repository</source>
+ <translation>Экспорт из репозитория</translation>
+ </message>
+ <message>
+ <location filename="VCS/ProjectHelper.py" line="79"/>
+ <source>&Export from repository...</source>
+ <translation>&Экспорт из репозитория...</translation>
+ </message>
+ <message>
+ <location filename="VCS/ProjectHelper.py" line="81"/>
<source>Export a project from the repository</source>
<translation>Экспортировать проект из репозитория</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="82"/>
+ <location filename="VCS/ProjectHelper.py" line="84"/>
<source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
<translation><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="89"/>
+ <location filename="VCS/ProjectHelper.py" line="91"/>
<source>Add to repository</source>
<translation>Добавить в репозиторий</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="89"/>
- <source>&Add to repository...</source>
- <translation>&Добавить в репозиторий...</translation>
- </message>
- <message>
<location filename="VCS/ProjectHelper.py" line="91"/>
+ <source>&Add to repository...</source>
+ <translation>&Добавить в репозиторий...</translation>
+ </message>
+ <message>
+ <location filename="VCS/ProjectHelper.py" line="93"/>
<source>Add the local project to the VCS repository</source>
<translation>Добавить локальный проект в репозиторий VCS</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="94"/>
+ <location filename="VCS/ProjectHelper.py" line="96"/>
<source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source>
<translation><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий VCS.</p></translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="163"/>
+ <location filename="VCS/ProjectHelper.py" line="166"/>
<source>New Project</source>
<translation>Новый проект</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="305"/>
+ <location filename="VCS/ProjectHelper.py" line="308"/>
<source>Select version control system for the project</source>
<translation>Выберите систему контроля версий (VCS) для проекта</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="324"/>
+ <location filename="VCS/ProjectHelper.py" line="327"/>
<source>Would you like to edit the VCS command options?</source>
<translation>Желаете ли вы редактировать опции команд VCS?</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="176"/>
+ <location filename="VCS/ProjectHelper.py" line="179"/>
<source>Create project directory</source>
<translation>Создать каталог проекта</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="176"/>
+ <location filename="VCS/ProjectHelper.py" line="179"/>
<source><p>The project directory <b>{0}</b> could not be created.</p></source>
<translation><p>Невозможно создать каталог проекта <b>{0}</b>.</p></translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="251"/>
+ <location filename="VCS/ProjectHelper.py" line="254"/>
<source>New project from repository</source>
<translation>Новый проект из репозитория</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="201"/>
+ <location filename="VCS/ProjectHelper.py" line="204"/>
<source>Select a project file to open.</source>
<translation>Выберите файл проекта, который надо открыть.</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="243"/>
+ <location filename="VCS/ProjectHelper.py" line="246"/>
<source>Shall the project file be added to the repository?</source>
<translation>Добавить файл проекта в репозиторий?</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="251"/>
+ <location filename="VCS/ProjectHelper.py" line="254"/>
<source>The project could not be retrieved from the repository.</source>
<translation>Невозможно извлечь проект из репозитория.</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="324"/>
+ <location filename="VCS/ProjectHelper.py" line="327"/>
<source>Import Project</source>
<translation>Импортировать проект</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="377"/>
+ <location filename="VCS/ProjectHelper.py" line="380"/>
<source>Remove project from repository</source>
<translation>Удалить проект из репозитория</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="377"/>
+ <location filename="VCS/ProjectHelper.py" line="380"/>
<source>Dou you really want to remove this project from the repository (and disk)?</source>
<translation>Вы правда хотите удалить этот проект и из репозитория, и с диска?</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="353"/>
+ <location filename="VCS/ProjectHelper.py" line="356"/>
<source>Update</source>
<translation>Обновить</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="435"/>
+ <location filename="VCS/ProjectHelper.py" line="438"/>
<source>The project should be reread. Do this now?</source>
<translation>Необходимо перезагрузить проект. Сделать это?</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="216"/>
+ <location filename="VCS/ProjectHelper.py" line="219"/>
<source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source>
<translation>В проекте отсутствует файл описания проекта (*.e4p). Создать?</translation>
</message>
<message>
- <location filename="VCS/ProjectHelper.py" line="435"/>
+ <location filename="VCS/ProjectHelper.py" line="438"/>
<source>Switch</source>
<translation type="unfinished">Переключиться</translation>
</message>
@@ -54442,17 +54474,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/>
<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="1741"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/>
<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="1748"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/>
<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>
@@ -54463,30 +54495,30 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/>
<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="1729"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/>
<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="1745"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1747"/>
<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="1236"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/>
<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="1252"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1254"/>
<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>
@@ -54496,7 +54528,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1284"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -54513,7 +54545,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
