--- a/i18n/eric5_ru.ts Wed Feb 22 19:14:07 2012 +0100
+++ b/i18n/eric5_ru.ts Wed Feb 22 19:22:42 2012 +0100
@@ -16365,42 +16365,42 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/>
<source>The hg process finished with the exit code {0}</source>
<translation>Процесс hg завершился с кодом возврата {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<source>Create project repository</source>
<translation>Создать репозиторий проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<source>The project repository could not be created.</source>
<translation>Не могу создать репозиторий проекта.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/>
<source>Creating Mercurial repository</source>
<translation>Создание репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/>
<source>Initial commit to Mercurial repository</source>
<translation>Первичная подача в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Создание копии репозитория</translation>
</message>
@@ -16410,32 +16410,32 @@
<translation type="obsolete">Подача изменений в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Синхронизация с репозиторием</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Добавление файлов/каталогов в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Удаление файлов/каталогов из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/>
<source>Renaming {0}</source>
<translation>Переименование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/>
<source>Merging</source>
<translation>Слияние</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
@@ -16450,200 +16450,210 @@
<translation type="obsolete">Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/>
<source>Taging in the Mercurial repository</source>
<translation>Создание меток в репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/>
<source>Reverting changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/>
<source>Enter branch name</source>
<translation>Введите имя ветви</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/>
<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="2277"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/>
<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="2358"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
<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="2664"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<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="2425"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAnnotateDialog</name>
@@ -18116,6 +18126,84 @@
</message>
</context>
<context>
+ <name>HgGraftDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/>
+ <source>Revisions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/>
+ <source>Enter changesets by number, id, range or revset expression one per line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="45"/>
+ <source>Select to give user information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/>
+ <source>User</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/>
+ <source>Select to use the name of the current user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/>
+ <source>Use current user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/>
+ <source>Username:</source>
+ <translation type="unfinished">Имя пользователя:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/>
+ <source>Enter the user name to be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/>
+ <source>Select to give date and time information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/>
+ <source>Date and Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/>
+ <source>Select to use the current date and time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/>
+ <source>Use current date and time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/>
+ <source>Date/Time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/>
+ <source>Enter the date and time to be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgImportDialog</name>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/>
@@ -19870,7 +19958,7 @@
<translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/>
<source>Repository Administration</source>
<translation>Администрирование репозитория</translation>
</message>
@@ -19905,7 +19993,7 @@
<translation>Создать файл коллекции изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
@@ -19920,7 +20008,7 @@
<translation>Применить файл(ы) группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/>
<source>Changegroup Management</source>
<translation>Менеджмент группы изменений</translation>
</message>
@@ -20010,7 +20098,7 @@
<translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/>
<source>Bisect</source>
<translation>Двоичный поиск</translation>
</message>
@@ -20115,7 +20203,7 @@
<translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
<source>Specials</source>
<translation>Специфический</translation>
</message>
@@ -20140,12 +20228,12 @@
<translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
<source>Pull</source>
<translation>Загрузить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
<source>The project should be reread. Do this now?</source>
<translation>Необходимо перезагрузить проект. Сделать это?</translation>
</message>
@@ -20180,7 +20268,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
@@ -20260,7 +20348,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
@@ -20280,12 +20368,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
<source>Patch Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/>
<source>Revert Changes</source>
<translation type="unfinished"></translation>
</message>
@@ -20329,6 +20417,46 @@
<source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/>
+ <source>Copies changesets from another branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
+ <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/>
+ <source>Continue Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
+ <source>Continue the last copying session after conflicts were resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/>
+ <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/>
+ <source>Graft</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -51654,17 +51782,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/>
<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="1718"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/>
<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="1725"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/>
<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>
@@ -51675,30 +51803,30 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/>
<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="1706"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/>
<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="1722"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/>
<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="1213"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/>
<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="1229"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/>
<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>
@@ -51708,7 +51836,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -51725,7 +51853,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
