--- a/i18n/eric5_ru.ts Sat May 17 16:53:00 2014 +0200
+++ b/i18n/eric5_ru.ts Sat May 17 18:18:06 2014 +0200
@@ -9466,7 +9466,7 @@
<translation type="obsolete"><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6134"/>
+ <location filename="../QScintilla/Editor.py" line="6133"/>
<source>File changed</source>
<translation>Файл изменён</translation>
</message>
@@ -9511,7 +9511,7 @@
<translation>Редактировать точку останова...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4856"/>
+ <location filename="../QScintilla/Editor.py" line="4855"/>
<source>Enable breakpoint</source>
<translation>Разрешить точку останова</translation>
</message>
@@ -9541,82 +9541,82 @@
<translation>Левая клавиша мыши ставит точки останова</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4859"/>
+ <location filename="../QScintilla/Editor.py" line="4858"/>
<source>Disable breakpoint</source>
<translation>Запретить точку останова</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5203"/>
+ <location filename="../QScintilla/Editor.py" line="5202"/>
<source>Code Coverage</source>
<translation>Охват кода</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5203"/>
+ <location filename="../QScintilla/Editor.py" line="5202"/>
<source>Please select a coverage file</source>
<translation>Пожалуйста, выберите файл для информации охвата</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5857"/>
+ <location filename="../QScintilla/Editor.py" line="5856"/>
<source>Macro Name</source>
<translation>Имя макроса</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5857"/>
+ <location filename="../QScintilla/Editor.py" line="5856"/>
<source>Select a macro name:</source>
<translation>Задайте имя макроса:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5928"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Macro files (*.macro)</source>
<translation>Макросы (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5885"/>
+ <location filename="../QScintilla/Editor.py" line="5884"/>
<source>Load macro file</source>
<translation>Загрузить макрос</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5908"/>
+ <location filename="../QScintilla/Editor.py" line="5907"/>
<source>Error loading macro</source>
<translation>Ошибка при загрузке макроса</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5928"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Save macro file</source>
<translation>Сохранить файл с макросами</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5945"/>
+ <location filename="../QScintilla/Editor.py" line="5944"/>
<source>Save macro</source>
<translation>Сохранить макрос</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5961"/>
+ <location filename="../QScintilla/Editor.py" line="5960"/>
<source>Error saving macro</source>
<translation>Ошибка при сохранении макроса</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5974"/>
+ <location filename="../QScintilla/Editor.py" line="5973"/>
<source>Start Macro Recording</source>
<translation>Начало записи макроса</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6000"/>
+ <location filename="../QScintilla/Editor.py" line="5999"/>
<source>Macro Recording</source>
<translation>Запись макроса</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6000"/>
+ <location filename="../QScintilla/Editor.py" line="5999"/>
<source>Enter name of the macro:</source>
<translation>Задайте имя макроса:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5382"/>
+ <location filename="../QScintilla/Editor.py" line="5381"/>
<source>Profile Data</source>
<translation>Данные профайлера</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5382"/>
+ <location filename="../QScintilla/Editor.py" line="5381"/>
<source>Please select a profile file</source>
<translation>Пожалуйста, выберите файл профиля</translation>
</message>
@@ -9666,7 +9666,7 @@
<translation>Автосохранение разрешено</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6432"/>
+ <location filename="../QScintilla/Editor.py" line="6431"/>
<source>Drop Error</source>
<translation>Ошибка Drag&&Drop</translation>
</message>
@@ -9676,12 +9676,12 @@
<translation>Показать сообщение о синтаксической ошибке</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5542"/>
+ <location filename="../QScintilla/Editor.py" line="5541"/>
<source>Syntax Error</source>
<translation>Синтаксическая ошибка</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5542"/>
+ <location filename="../QScintilla/Editor.py" line="5541"/>
<source>No syntax error message available.</source>
<translation>Нет сообщения о синтаксической ошибке.</translation>
</message>
@@ -9711,17 +9711,17 @@
<translation>Предыдущая невыполняемая строка</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5267"/>
+ <location filename="../QScintilla/Editor.py" line="5266"/>
<source>Show Code Coverage Annotations</source>
<translation>Показать аннотации по охвату</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5260"/>
+ <location filename="../QScintilla/Editor.py" line="5259"/>
<source>All lines have been covered.</source>
<translation>Все строки выполняются.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5267"/>
+ <location filename="../QScintilla/Editor.py" line="5266"/>
<source>There is no coverage file available.</source>
<translation>Нет файла с информацией по охвату.</translation>
</message>
@@ -9731,22 +9731,22 @@
<translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5899"/>
+ <location filename="../QScintilla/Editor.py" line="5898"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation><p>Невозможно прочитать файл с макросами: <b>{0}</b></p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5908"/>
+ <location filename="../QScintilla/Editor.py" line="5907"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation><p>Файл с макросами <b>{0}</b> повреждён</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5961"/>
+ <location filename="../QScintilla/Editor.py" line="5960"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6432"/>
+ <location filename="../QScintilla/Editor.py" line="6431"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation><p><b>{0}</b> не является файлом</p></translation>
</message>
@@ -9791,82 +9791,82 @@
<translation>Нет языка</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6292"/>
+ <location filename="../QScintilla/Editor.py" line="6291"/>
<source>{0} (ro)</source>
<translation>{0} (только чтение)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6453"/>
+ <location filename="../QScintilla/Editor.py" line="6452"/>
<source>Resources</source>
<translation>Ресурсы</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6455"/>
+ <location filename="../QScintilla/Editor.py" line="6454"/>
<source>Add file...</source>
<translation>Добавить файл...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6457"/>
+ <location filename="../QScintilla/Editor.py" line="6456"/>
<source>Add files...</source>
<translation>Добавить файлы...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6459"/>
+ <location filename="../QScintilla/Editor.py" line="6458"/>
<source>Add aliased file...</source>
<translation>Добавить файл под другим именем...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6462"/>
+ <location filename="../QScintilla/Editor.py" line="6461"/>
<source>Add localized resource...</source>
<translation>Добавить локализованный ресурс...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6485"/>
+ <location filename="../QScintilla/Editor.py" line="6484"/>
<source>Add file resource</source>
<translation>Добавить файл ресурсов</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6501"/>
+ <location filename="../QScintilla/Editor.py" line="6500"/>
<source>Add file resources</source>
<translation>Добавить файлы ресурсов</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6529"/>
+ <location filename="../QScintilla/Editor.py" line="6528"/>
<source>Add aliased file resource</source>
<translation>Добавить файл ресурсов под другим именем</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6529"/>
+ <location filename="../QScintilla/Editor.py" line="6528"/>
<source>Alias for file <b>{0}</b>:</source>
<translation>Другое имя для файла <b>{0}</b>:</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6593"/>
+ <location filename="../QScintilla/Editor.py" line="6592"/>
<source>Package Diagram</source>
<translation>Диаграмма пакетов</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6593"/>
+ <location filename="../QScintilla/Editor.py" line="6592"/>
<source>Include class attributes?</source>
<translation>Включать атрибуты класса?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6627"/>
+ <location filename="../QScintilla/Editor.py" line="6626"/>
<source>Application Diagram</source>
<translation>Диаграмма приложения</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6627"/>
+ <location filename="../QScintilla/Editor.py" line="6626"/>
<source>Include module names?</source>
<translation>Включать имена модулей?</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6466"/>
+ <location filename="../QScintilla/Editor.py" line="6465"/>
<source>Add resource frame</source>
<translation>Добавить фрагмент ресурсов</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5974"/>
+ <location filename="../QScintilla/Editor.py" line="5973"/>
<source>Macro recording is already active. Start new?</source>
<translation>Запись макроса уже идёт. Начать новую запись?</translation>
</message>
@@ -9921,12 +9921,12 @@
<translation>Не задан формат экспорта. Отмена...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6613"/>
+ <location filename="../QScintilla/Editor.py" line="6612"/>
<source>Imports Diagram</source>
<translation>Диаграмма импортов</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6613"/>
+ <location filename="../QScintilla/Editor.py" line="6612"/>
<source>Include imports from external modules?</source>
<translation>Включать импорты из внешних модулей?</translation>
</message>
@@ -10006,7 +10006,7 @@
<translation>Задайте язык лексического анализатора.</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6915"/>
+ <location filename="../QScintilla/Editor.py" line="6914"/>
<source>Check spelling...</source>
<translation>Проверка орфографии...</translation>
</message>
@@ -10016,12 +10016,12 @@
<translation>Проверка орфографии подсвеченного участка...</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6918"/>
+ <location filename="../QScintilla/Editor.py" line="6917"/>
<source>Add to dictionary</source>
<translation>Добавить в слварь</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6920"/>
+ <location filename="../QScintilla/Editor.py" line="6919"/>
<source>Ignore All</source>
<translation>Игнорировать всё</translation>
</message>
@@ -10041,7 +10041,7 @@
<translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
+ <location filename="../QScintilla/Editor.py" line="6123"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source>
<translation><p>Файл <b>{0}</b> был изменён, будучи открытым в eric5. Обновить?</p></translation>
</message>
@@ -10081,22 +10081,22 @@
<translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5945"/>
+ <location filename="../QScintilla/Editor.py" line="5944"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Макро <b>{0}</b> уже сущеструет. Переписать?</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5796"/>
+ <location filename="../QScintilla/Editor.py" line="5795"/>
<source>Warning: {0}</source>
<translation>Предупреждение: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5803"/>
+ <location filename="../QScintilla/Editor.py" line="5802"/>
<source>Error: {0}</source>
<translation>Ошибка: {0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6130"/>
+ <location filename="../QScintilla/Editor.py" line="6129"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation>
</message>
@@ -10141,27 +10141,27 @@
<translation>Предыдущее изменение</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7332"/>
+ <location filename="../QScintilla/Editor.py" line="7331"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7332"/>
+ <location filename="../QScintilla/Editor.py" line="7331"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5732"/>
+ <location filename="../QScintilla/Editor.py" line="5731"/>
<source>Warning</source>
<translation type="unfinished">Предупреждение</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5732"/>
+ <location filename="../QScintilla/Editor.py" line="5731"/>
<source>No warning messages available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5793"/>
+ <location filename="../QScintilla/Editor.py" line="5792"/>
<source>Style: {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -20031,42 +20031,42 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/>
<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="1770"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/>
<source>Create project repository</source>
<translation>Создать репозиторий проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/>
<source>The project repository could not be created.</source>
<translation>Не могу создать репозиторий проекта.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="347"/>
<source>Creating Mercurial repository</source>
<translation>Создание репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/>
<source>Initial commit to Mercurial repository</source>
<translation>Первичная подача в репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="407"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Создание копии репозитория</translation>
</message>
@@ -20076,32 +20076,32 @@
<translation type="obsolete">Подача изменений в репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="620"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="624"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Синхронизация с репозиторием</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="670"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Добавление файлов/каталогов в репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="740"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="744"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Удаление файлов/каталогов из репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="802"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/>
<source>Renaming {0}</source>
<translation>Переименование {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
<source>Merging</source>
<translation>Слияние</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1531"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
@@ -20116,19 +20116,19 @@
<translation type="obsolete">Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/>
<source>Resolving files/directories</source>
- <translation>Разрешение конфликтов</translation>
+ <translation type="obsolete">Разрешение конфликтов</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/>
@@ -20136,12 +20136,12 @@
<translation type="obsolete">Создание меток в репозитории</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/>
<source>Reverting changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1311"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
@@ -20156,92 +20156,92 @@
<translation type="obsolete">Введите имя ветви</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2682"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2266"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2712"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2742"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2487"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/>
<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="2699"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
@@ -20251,230 +20251,260 @@
<translation type="obsolete">Файлы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2828"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588"/>
<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="2780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2855"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/>
- <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="568"/>
- <source>Committing changes to Mercurial repository</source>
- <translation>Фиксировать изменения в репозиторий</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3429"/>
- <source>Mercurial Command Server</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
- <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="3429"/>
- <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="2848"/>
+ <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="572"/>
+ <source>Committing changes to Mercurial repository</source>
+ <translation>Фиксировать изменения в репозиторий</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3504"/>
+ <source>Mercurial Command Server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3344"/>
+ <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="3504"/>
+ <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="2923"/>
<source>Import Patch</source>
<translation type="unfinished">Импортировать патч</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3017"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3070"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3096"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3213"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3171"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3194"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3159"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3234"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/>
<source>Commit Changes</source>
<translation>Фиксировать изменения</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="503"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="507"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/>
<source>Revert changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1015"/>
<source>Do you really want to revert all changes of the project?</source>
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1142"/>
<source>Current branch tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2129"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<source>Cancelling uncommitted merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3537"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3612"/>
<source>Mercurial Bookmark</source>
<translation>Mercurial закладка</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/>
<source>Delete Bookmark</source>
<translation>Удалить закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/>
<source>Select the bookmark to be deleted:</source>
<translation>Выберите закладку, которая будет удалена:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3566"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/>
<source>Delete Mercurial Bookmark</source>
<translation>Удалить Mercurial закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3594"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3669"/>
<source>Rename Mercurial Bookmark</source>
<translation>Переименовать Mercurial закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3627"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/>
<source>Move Mercurial Bookmark</source>
<translation>Переместить Mercurial закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/>
<source>Pull Bookmark</source>
<translation>Тянуть закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3712"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3787"/>
<source>Select the bookmark to be pulled:</source>
<translation>Выберите закладку, для перетаскивания:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3723"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3798"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation>Загрузка закладки из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/>
<source>Push Bookmark</source>
<translation>Протолкнуть закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3820"/>
<source>Select the bookmark to be push:</source>
<translation>Выберите закладку, для проталкивания:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3756"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Проталкивание закладки в удалённый репозиторий</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/>
+ <source>Do you really want to re-merge these files or directories?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/>
+ <source>Do you really want to re-merge the project?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1117"/>
+ <source>Re-Merging</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/>
+ <source>Marking as 'unresolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+ <source>Marking as 'resolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -21576,6 +21606,139 @@
</message>
</context>
<context>
+ <name>HgConflictsListDialog</name>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="14"/>
+ <source>Mercurial Conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="23"/>
+ <source><b>Conflicts List</b>\n<p>This shows a list of files which had or still have conflicts.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="42"/>
+ <source>Status</source>
+ <translation type="unfinished">Статус</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="47"/>
+ <source>Name</source>
+ <translation type="unfinished">Имя</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="70"/>
+ <source>Press to mark the selected entries as 'resolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="245"/>
+ <source>Resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="80"/>
+ <source>Press to mark the selected entries as 'unresolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="243"/>
+ <source>Unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="103"/>
+ <source>Press to re-merge the selected entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="106"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="113"/>
+ <source>Press to edit the selected entry</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="116"/>
+ <source>Edit</source>
+ <translation type="unfinished">Редактировать</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="144"/>
+ <source>Errors</source>
+ <translation type="unfinished">Ошибки</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="163"/>
+ <source>Input</source>
+ <translation type="unfinished">Ввод</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="185"/>
+ <source>Press to send the input to the hg process</source>
+ <translation type="unfinished">Отправить данные процессу hg</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="188"/>
+ <source>&Send</source>
+ <translation type="unfinished">&Отправить</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="191"/>
+ <source>Alt+S</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="198"/>
+ <source>Enter data to be sent to the hg process</source>
+ <translation type="unfinished">Задайте данные, которые будут посланы процессу hg</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="205"/>
+ <source>Select to switch the input field to password mode</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="208"/>
+ <source>&Password Mode</source>
+ <translation type="unfinished">&Парольный режим</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="211"/>
+ <source>Alt+P</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/>
+ <source>&Refresh</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/>
+ <source>Press to refresh the list of conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/>
+ <source>Process Generation Error</source>
+ <translation type="unfinished">Ошибка процесса генерации</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="156"/>
+ <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="247"/>
+ <source>Unknown Status</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgCopyDialog</name>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="14"/>
@@ -23356,22 +23519,22 @@
<context>
<name>HgProjectBrowserHelper</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="588"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="606"/>
<source>Version Control</source>
<translation>Контроль версий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="600"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="618"/>
<source>Commit changes to repository...</source>
<translation>Зафиксировать изменения в репозитории...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/>
<source>Add to repository</source>
<translation>Добавить в репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/>
<source>Remove from repository (and disk)</source>
<translation>Удаление из репозитория (и с диска)</translation>
</message>
@@ -23386,7 +23549,7 @@
<translation type="obsolete">Переместить в репозитории</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542"/>
<source>Show log</source>
<translation>Показать журнал</translation>
</message>
@@ -23396,7 +23559,7 @@
<translation type="obsolete">Показать ограниченный журнал</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="534"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="546"/>
<source>Show log browser</source>
<translation>Показать проводник журналов</translation>
</message>
@@ -23416,27 +23579,27 @@
<translation type="obsolete">Разрешить конфликт</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/>
<source>Select all local file entries</source>
<translation>Выделить все локальные файлы</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666"/>
<source>Select all versioned file entries</source>
<translation>Выделить все файлы с версиями (VCS)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="668"/>
<source>Select all local directory entries</source>
<translation>Выделить все локальные каталоги</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="670"/>
<source>Select all versioned directory entries</source>
<translation>Выделить все каталоги с версиями (VCS)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="617"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="635"/>
<source>Show status</source>
<translation>Показать статус</translation>
</message>
@@ -23446,12 +23609,12 @@
<translation>Показать файл, снабжённый комментариями</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="650"/>
<source>Revert changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/>
<source>Remove from repository only</source>
<translation>Удалить только из репозитория</translation>
</message>
@@ -23461,7 +23624,7 @@
<translation type="obsolete">Вы правда хотите удалить эти файлы переводов и из репозитория?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="830"/>
<source>Do you really want to remove these files from the repository?</source>
<translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation>
</message>
@@ -23471,12 +23634,12 @@
<translation type="obsolete">Конфликт решён</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="537"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="527"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="539"/>
<source>Move</source>
<translation>Сдвинуть</translation>
</message>
@@ -23486,7 +23649,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/>
<source>Show differences</source>
<translation type="unfinished"></translation>
</message>
@@ -23496,7 +23659,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/>
<source>Show differences (extended)</source>
<translation type="unfinished"></translation>
</message>
@@ -23506,10 +23669,20 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="654"/>
<source>Conflicts resolved</source>
<translation type="unfinished">Конфликт решён</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/>
+ <source>Conflicts unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgProjectHelper</name>
@@ -23904,157 +24077,157 @@
<translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
<source>Tag in repository</source>
<translation>Создать метку в репозитории</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/>
<source>&Tag in repository...</source>
<translation>Создать &метку в репозитории...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
- <source>Tag the local project in the repository</source>
- <translation>Создать в репозитории метку для проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/>
- <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
- <translation><b>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
- <source>List tags</source>
- <translation>Список меток</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
- <source>List tags...</source>
- <translation>Список меток...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/>
- <source>List tags of the project</source>
- <translation>Список меток текущего проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation><b>Список меток</b><p>Отображает список меток текущего проекта.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/>
- <source>List branches</source>
- <translation>Список ветвей</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/>
- <source>List branches...</source>
- <translation>Список ветвей...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/>
- <source>List branches of the project</source>
- <translation>Список ветвей текущего проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
- <source>Create branch</source>
- <translation>Создать ветвь</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
- <source>Create &branch...</source>
- <translation>Создать &ветвь...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/>
- <source>Create a new branch for the local project in the repository</source>
- <translation>Создать новую ветвь в репозитории для локального проекта</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
- <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
- <translation><b>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</p></translation>
+ <source>Tag the local project in the repository</source>
+ <translation>Создать в репозитории метку для проекта</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
+ <translation><b>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/>
+ <source>List tags</source>
+ <translation>Список меток</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/>
+ <source>List tags...</source>
+ <translation>Список меток...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
+ <source>List tags of the project</source>
+ <translation>Список меток текущего проекта</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation><b>Список меток</b><p>Отображает список меток текущего проекта.</p></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/>
- <source>Close branch</source>
- <translation>Закрыть ветвь</translation>
+ <source>List branches</source>
+ <translation>Список ветвей</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/>
+ <source>List branches...</source>
+ <translation>Список ветвей...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/>
- <source>Close the current branch of the local project</source>
- <translation>Закрыть ветвь локального проекта</translation>
+ <source>List branches of the project</source>
+ <translation>Список ветвей текущего проекта</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Create branch</source>
+ <translation>Создать ветвь</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Create &branch...</source>
+ <translation>Создать &ветвь...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/>
+ <source>Create a new branch for the local project in the repository</source>
+ <translation>Создать новую ветвь в репозитории для локального проекта</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/>
+ <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
+ <translation><b>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
+ <source>Close branch</source>
+ <translation>Закрыть ветвь</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/>
+ <source>Close the current branch of the local project</source>
+ <translation>Закрыть ветвь локального проекта</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
<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="549"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
<source>Switch</source>
<translation>Переключиться</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
<source>S&witch...</source>
<translation>Пе&реключиться...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/>
<source>Switch the working directory to another revision</source>
<translation>Переключить рабочий каталог на другую ревизию</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
<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="565"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
<source>Cleanup</source>
<translation>Очистка</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
<source>Cleanu&p</source>
<translation>О&чистка</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
<source>Cleanup the local project</source>
<translation>Очистить локальный проект</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
<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="579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<source>Execute command</source>
<translation>Выполнить команду</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<source>E&xecute command...</source>
<translation>В&ыполнить команду...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/>
<source>Execute an arbitrary Mercurial command</source>
<translation>Выполнить произвольную команду Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/>
<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>
@@ -24079,22 +24252,22 @@
<translation type="obsolete"><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
<source>Configure</source>
<translation>Настроить</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
<source>Configure...</source>
<translation>Настроить...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
<source>Show the configuration dialog with the Mercurial page selected</source>
<translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation>
</message>
@@ -24139,62 +24312,62 @@
<translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
<source>Show paths</source>
<translation>Показать пути</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
<source>Show paths...</source>
<translation>Показать пути...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/>
<source>Show the aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/>
<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="668"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
<source>Verify repository</source>
<translation>Проверить репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
<source>Verify repository...</source>
<translation>Проверить репозиторий...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/>
<source>Verify the integrity of the repository</source>
<translation>Проверить целостность репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/>
<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="682"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
<source>Recover</source>
<translation>Восстановить</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
<source>Recover...</source>
<translation>Восстановить...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/>
<source>Recover from an interrupted transaction</source>
<translation>Восстановить после прерванной транзакции</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/>
<source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation>
</message>
@@ -24204,112 +24377,112 @@
<translation type="obsolete">Администрирование репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/>
<source>Create .hgignore</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/>
<source>Create a .hgignore file with default values</source>
<translation>Создать файл .hgignore со значениями по умолчанию</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/>
<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="724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/>
<source>Create changegroup...</source>
<translation>Создать группу изменений...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/>
<source>Create changegroup file collecting changesets</source>
<translation>Создать файл коллекции изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1578"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1651"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Apply changegroups...</source>
<translation>Применить группу изменений...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
<source>Apply one or several changegroup files</source>
<translation>Применить файл(ы) группы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/>
<source>Changegroup Management</source>
<translation>Менеджмент группы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/>
<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="761"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/>
<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="535"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/>
<source>Show current branch</source>
<translation>Показать текущую ветвь</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/>
<source>Show the current branch of the project</source>
<translation>Показать текущую ветвь проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
<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="769"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
<source>Mark as "good"</source>
<translation>Пометить как "хороший"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/>
<source>Mark a selectable changeset as good</source>
<translation>Пометить выбранные изменения как "хорошие"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/>
<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="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
<source>Mark as "bad"</source>
<translation>Пометить как "плохой"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/>
<source>Mark a selectable changeset as bad</source>
<translation>Пометить выбранные изменения как "плохие"</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/>
<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="797"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
<source>Skip</source>
<translation>Пропустить</translation>
</message>
@@ -24324,72 +24497,72 @@
<translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/>
+ <source>Reset the bisect search data</source>
+ <translation>Сбросить данные двоичного поиска</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/>
+ <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="1261"/>
+ <source>Bisect</source>
+ <translation>Двоичный поиск</translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
- <source>Reset the bisect search data</source>
- <translation>Сбросить данные двоичного поиска</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/>
- <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="1215"/>
- <source>Bisect</source>
- <translation>Двоичный поиск</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/>
<source>Mark as "good"...</source>
<translation>Пометить как "хороший"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
<source>Mark as "bad"...</source>
<translation>Пометить как "плохой"...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
<source>Preview changegroup...</source>
<translation>Предпросмотр группы изменений...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source>Identify</source>
<translation>Идентифицировать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source>Identify...</source>
<translation>Идентифицировать...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
- <source>Identify the project directory</source>
- <translation>Задайте каталог проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/>
- <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="743"/>
- <source>Preview a changegroup file containing a collection of changesets</source>
- <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/>
+ <source>Identify the project directory</source>
+ <translation>Задайте каталог проекта</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <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="789"/>
+ <source>Preview a changegroup file containing a collection of changesets</source>
+ <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/>
<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>
@@ -24414,17 +24587,17 @@
<translation type="obsolete"><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/>
<source>Back out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
<source>Back out changes of an earlier changeset</source>
<translation>Отмена предыдущих изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation>
</message>
@@ -24444,317 +24617,317 @@
<translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/>
<source>Specials</source>
<translation>Специфический</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/>
<source>Serve project repository</source>
<translation>Запустить сервер для репозитория проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/>
<source>Serve project repository...</source>
<translation>Запустить сервер для репозитория проекта...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
<source>Serve the project repository</source>
<translation>Запустить сервер для репозитория проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/>
<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="1415"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1468"/>
<source>Pull</source>
<translation>Загрузить</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/>
<source>The project should be reread. Do this now?</source>
<translation>Необходимо перезагрузить проект. Сделать это?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
<source>Push new branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
<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="513"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/>
<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>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/>
+ <source>Rollback the last transaction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/>
+ <source>Extensions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <source>Edit user configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <source>Edit user configuration...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/>
+ <source>Show an editor to edit the user configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
+ <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <source>Edit repository configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <source>Edit repository configuration...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
+ <source>Show an editor to edit the repository configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/>
+ <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <source>Show combined configuration settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <source>Show combined configuration settings...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/>
+ <source>Show the combined configuration settings from all configuration files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
+ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/>
- <source>Rollback the last transaction</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/>
- <source>Extensions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/>
- <source>Edit user configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/>
- <source>Edit user configuration...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/>
- <source>Show an editor to edit the user configuration file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/>
- <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
- <source>Edit repository configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
- <source>Edit repository configuration...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/>
- <source>Show an editor to edit the repository configuration file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/>
- <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/>
- <source>Show combined configuration settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/>
- <source>Show combined configuration settings...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/>
- <source>Show the combined configuration settings from all configuration files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/>
- <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
<source>Skip...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/>
<source>Skip a selectable changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1707"/>
<source>Import Patch</source>
<translation type="unfinished">Импортировать патч</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/>
<source>Import Patch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/>
<source>Import a patch from a patch file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/>
<source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1209"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1255"/>
<source>Patch Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1727"/>
<source>Revert Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
<source>Export Patches...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
<source>Export revisions to patch files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/>
<source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/>
- <source>Change Phase...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/>
- <source>Change the phase of revisions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
- <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="1674"/>
- <source>Copy Changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/>
- <source>Copies changesets from another branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/>
- <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="940"/>
- <source>Continue Copying Session</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
- <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="947"/>
- <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="1268"/>
- <source>Graft</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1689"/>
- <source>Copy Changesets (Continue)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
- <source>Conflicts resolved</source>
- <translation type="unfinished">Конфликт решён</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
- <source>Con&flicts resolved</source>
- <translation type="unfinished">Кон&фликт решён</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/>
- <source>Mark all conflicts of the local project as resolved</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="438"/>
- <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <source>Change Phase...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/>
+ <source>Change the phase of revisions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/>
+ <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="1747"/>
+ <source>Copy Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/>
+ <source>Copies changesets from another branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/>
+ <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="986"/>
+ <source>Continue Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/>
+ <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="993"/>
+ <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="1314"/>
+ <source>Graft</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1762"/>
+ <source>Copy Changesets (Continue)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
+ <source>Conflicts resolved</source>
+ <translation type="unfinished">Конфликт решён</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/>
+ <source>Con&flicts resolved</source>
+ <translation type="unfinished">Кон&фликт решён</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
<source>Add...</source>
<translation>Добавить...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/>
<source>Add a sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/>
<source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/>
<source>Remove</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/>
<source>Remove...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
<source>Remove sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/>
<source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322"/>
<source>Sub-Repository</source>
<translation type="unfinished"></translation>
</message>
@@ -24784,32 +24957,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
<source>Create unversioned archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
<source>Create unversioned archive...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
<source>Create an unversioned archive from the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/>
<source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/>
<source>Administration</source>
<translation type="unfinished"></translation>
</message>
@@ -24849,180 +25022,235 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
<source>List bookmarks</source>
<translation>Список закладок</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
<source>List bookmarks...</source>
<translation>Список закладок...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1007"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/>
<source>List bookmarks of the project</source>
<translation>Список закладок проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/>
<source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
<translation><b>Список закладок</b><p>Отображает список закладок текущего проекта.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
<source>Define bookmark</source>
<translation>Определить закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
<source>Define bookmark...</source>
<translation>Определить закладку...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/>
<source>Define a bookmark for the project</source>
<translation>Определить закладку для проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/>
<source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
<translation><b>Определить закладку</b><p>Определяет закладку текущего проекта.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/>
<source>Delete bookmark</source>
<translation>Удалить закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
- <source>Delete bookmark...</source>
- <translation>Удалить закладку...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/>
- <source>Delete a bookmark of the project</source>
- <translation>Удалить закладоку проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/>
- <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
- <translation><b>Удалить закладку</b><p>Удалить закладку из текущего проекта.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/>
- <source>Rename bookmark</source>
- <translation>Переименовать закладку</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/>
- <source>Rename bookmark...</source>
- <translation>Переименовать закладку...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/>
- <source>Rename a bookmark of the project</source>
- <translation>Переименовать закладку проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1055"/>
- <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
- <translation><b>Переименовать закладку</b><p>Переименовать закладку текущего проекта.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
- <source>Move bookmark</source>
- <translation>Переместить закладку</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
- <source>Move bookmark...</source>
- <translation>Переместить закладку...</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/>
- <source>Move a bookmark of the project</source>
- <translation>Переместить закладку текущего проекта</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/>
- <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
- <translation><b>Переместить закладку</b><p>Переместить закладку из текущего проекта в другую ревизию.</p></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/>
- <source>Show incoming bookmarks</source>
- <translation>Показать измененные закладки</translation>
+ <source>Delete bookmark...</source>
+ <translation>Удалить закладку...</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/>
- <source>Show a list of incoming bookmarks</source>
- <translation>Показать список измененных закладок</translation>
+ <source>Delete a bookmark of the project</source>
+ <translation>Удалить закладоку проекта</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/>
- <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
- <translation><b>Показать измененные закладки</b><p>Показать новые закладки в удаленном репозитории.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/>
- <source>Pull bookmark</source>
- <translation>Тянуть закладку</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/>
- <source>Pull a bookmark from a remote repository</source>
- <translation>Загрузка закладки из удалённого репозитория</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/>
- <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
- <translation><b>Загрузить закладку</b><p>Загрузить закладку из удалённого репозитория в локальный репозиторий.</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/>
- <source>Show outgoing bookmarks</source>
- <translation>Показать выходящие закладки</translation>
+ <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
+ <translation><b>Удалить закладку</b><p>Удалить закладку из текущего проекта.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/>
+ <source>Rename bookmark</source>
+ <translation>Переименовать закладку</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/>
+ <source>Rename bookmark...</source>
+ <translation>Переименовать закладку...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
+ <source>Rename a bookmark of the project</source>
+ <translation>Переименовать закладку проекта</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/>
+ <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
+ <translation><b>Переименовать закладку</b><p>Переименовать закладку текущего проекта.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <source>Move bookmark</source>
+ <translation>Переместить закладку</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <source>Move bookmark...</source>
+ <translation>Переместить закладку...</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/>
+ <source>Move a bookmark of the project</source>
+ <translation>Переместить закладку текущего проекта</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/>
+ <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
+ <translation><b>Переместить закладку</b><p>Переместить закладку из текущего проекта в другую ревизию.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/>
+ <source>Show incoming bookmarks</source>
+ <translation>Показать измененные закладки</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/>
+ <source>Show a list of incoming bookmarks</source>
+ <translation>Показать список измененных закладок</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1132"/>
+ <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
+ <translation><b>Показать измененные закладки</b><p>Показать новые закладки в удаленном репозитории.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/>
+ <source>Pull bookmark</source>
+ <translation>Тянуть закладку</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/>
+ <source>Pull a bookmark from a remote repository</source>
+ <translation>Загрузка закладки из удалённого репозитория</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
+ <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
+ <translation><b>Загрузить закладку</b><p>Загрузить закладку из удалённого репозитория в локальный репозиторий.</p></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/>
+ <source>Show outgoing bookmarks</source>
+ <translation>Показать выходящие закладки</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/>
<source>Show a list of outgoing bookmarks</source>
<translation>Показать список выходящих изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/>
<source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
<translation><b>Показать исходящие закладки</b><p>Показать список новых закладок в локальном репозитории.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/>
<source>Push bookmark</source>
<translation>Протолкнуть закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/>
<source>Push a bookmark to a remote repository</source>
<translation>Проталкивание закладки в удалённый репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/>
<source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source>
<translation><b>Протолкнуть закладки</b><p>Протолкнуть закладку из локального репозитория в удалённый репозиторий.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/>
<source>Bookmarks</source>
<translation>Закладки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/>
<source>Tags</source>
<translation type="unfinished">Метки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/>
<source>Branches</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
+ <source>Re-Merge all conflicting, unresolved files of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
+ <source>Show conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
+ <source>Show conflicts...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
+ <source>Show a dialog listing all files with conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/>
+ <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
+ <source>Conflicts unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/>
+ <source>Mark all conflicts of the local project as unresolved</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
+ <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/>
+ <source>Manage Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/>
+ <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -67181,17 +67409,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/>
<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="2059"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/>
<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="2068"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/>
<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>
@@ -67202,30 +67430,30 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/>
<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="2044"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/>
<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="2064"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/>
<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="1378"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1433"/>
<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="1398"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1453"/>
<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>
@@ -67252,12 +67480,12 @@
{2}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2109"/>
<source><tr><td><b>Bookmarks</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="1436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
