--- a/i18n/eric5_ru.ts Sun Mar 02 15:21:25 2014 +0100 +++ b/i18n/eric5_ru.ts Sun Mar 02 15:56:18 2014 +0100 @@ -19805,42 +19805,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="265"/> <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="1779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="300"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="300"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="329"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="345"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="393"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -19850,32 +19850,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="606"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="656"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="788"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -19890,17 +19890,17 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> @@ -19910,267 +19910,267 @@ <translation type="obsolete">Создание меток в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2346"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2626"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2430"/> <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="2696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2725"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2785"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <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="2783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/> <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="550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="554"/> <source>Committing changes to Mercurial repository</source> <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3465"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3301"/> <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="3431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3465"/> <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="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2880"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2898"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2927"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2998"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3053"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3170"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3203"/> <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="3122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <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="3193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3222"/> <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="3193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3222"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3191"/> <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="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="489"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="489"/> <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="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <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="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <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="3059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3088"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> <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="1782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <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="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -21300,12 +21300,12 @@ <translation>Выполнить принудительно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="49"/> <source>Mercurial Move</source> <translation>Mercurial Move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="84"/> <source>Select target</source> <translation>Выберите цель</translation> </message> @@ -21374,12 +21374,12 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="154"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="154"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -22056,7 +22056,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> @@ -22086,17 +22086,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1363"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1360"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -22212,27 +22212,27 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="114"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="806"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="806"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -22247,17 +22247,17 @@ <translation>Метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="576"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="579"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="582"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -22297,22 +22297,22 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="65"/> <source>Mercurial Log (Incoming)</source> <translation>лог (входящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="67"/> <source>Mercurial Log (Outgoing)</source> <translation>лог (исходящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source>Bookmarks</source> <translation type="unfinished">Закладки</translation> </message> @@ -22322,12 +22322,12 @@ <translation type="obsolete">Обновить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -22337,28 +22337,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1522"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1559"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -22378,30 +22378,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="155"/> <source>Tag</source> <translation type="unfinished">Метка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1559"/> <source>Switch</source> <translation type="unfinished">Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <source>Pull large files for selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="896"/> + <source>{0} (large file)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -22809,17 +22824,17 @@ <p>Для удалённых репозиториев URL должен содержать имя сервера.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="30"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="28"/> <source>&Protocol:</source> <translation>&Протокол:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="40"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="38"/> <source>Select the protocol to access the repository</source> <translation>Задайте протокол доступа к репозиторию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -22829,27 +22844,27 @@ <translation type="obsolete">...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="69"/> <source>&Revision:</source> <translation>&Ревизия:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="79"/> <source>Enter the revision the new project should be generated from</source> <translation>Задайте ревизию, из которой будет собран проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="89"/> <source>Project &Directory:</source> <translation>&Каталог проекта:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="99"/> <source>Enter the directory of the new project.</source> <translation>Задайте каталог нового проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="102"/> <source><b>Project Directory</b> <p>Enter the directory of the new project. It will be retrieved from the repository and be placed in this directory.</p></source> @@ -22857,17 +22872,17 @@ <p>Задайте каталог проекта. Он будет получен из репозитория и помещён в этот каталог.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="75"/> <source>Select Repository-Directory</source> <translation>Задайте каталог репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="90"/> <source>Select Project Directory</source> <translation>Выберите каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="62"/> <source>Select the repository url via a directory selection dialog</source> <translation>Выберите каталог с помощью диалога</translation> </message> @@ -22877,10 +22892,20 @@ <translation type="obsolete">Задайте URL репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="55"/> <source>Enter the url path of the repository (without protocol part)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="114"/> + <source>Download all versions of all large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="121"/> + <source><b>Note:</b> This option increases the download time and volume.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgOptionsDialog</name> @@ -22977,22 +23002,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="586"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> - <source>Commit changes to repository...</source> - <translation>Зафиксировать изменения в репозитории...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> - <source>Add to repository</source> - <translation>Добавить в репозиторий</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <source>Commit changes to repository...</source> + <translation>Зафиксировать изменения в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> + <source>Add to repository</source> + <translation>Добавить в репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> @@ -23007,7 +23032,7 @@ <translation type="obsolete">Переместить в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="528"/> <source>Show log</source> <translation>Показать журнал</translation> </message> @@ -23017,17 +23042,17 @@ <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> @@ -23037,42 +23062,42 @@ <translation type="obsolete">Разрешить конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Select all versioned file entries</source> <translation>Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="792"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> @@ -23082,37 +23107,37 @@ <translation type="obsolete">Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="792"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Conflict resolved</source> <translation>Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> <source>Move</source> <translation>Сдвинуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -23120,142 +23145,142 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="103"/> <source>New from repository</source> <translation>Новый из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="103"/> <source>&New from repository...</source> <translation>&Новый из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="108"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="111"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Новый из репозитория</b><p>Создать (скопировать) новый проект из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="119"/> <source>Show incoming log</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <source>Show the log of incoming changes</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="127"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Показать журнал изменений</b><p>Показать журнал входящих в репозиторий изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>Pull changes</source> <translation>Загрузить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="140"/> <source>Pull changes from a remote repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143"/> <source><b>Pull changes</b><p>This pulls changes 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="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> <source>Update from repository</source> <translation>Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> <source>&Update from repository</source> <translation>&Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> <source>Update the local project from the Mercurial repository</source> <translation>Обновить локальный проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Обновить из репозитория</b><p>Обновить локальный проект из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167"/> <source>Commit changes to repository</source> <translation>Сохранение изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167"/> <source>&Commit changes to repository...</source> <translation>&Сохранение изменения в репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Сохранить изменения локального проекта в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="175"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Сохранение изменения в репозиторий</b><p>Сохранить изменения локального проекта в репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="183"/> <source>Show outgoing log</source> <translation>Показать журнал выходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> <source>Show the log of outgoing changes</source> <translation>Показать журнал выходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Показать журнал изменений</b><p>Показать журнал выходящих из репозитория изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199"/> <source>Push changes</source> <translation>Послать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="204"/> <source>Push changes to a remote repository</source> <translation>Послать изменения в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="207"/> <source><b>Push changes</b><p>This pushes changes 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="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="236"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation> </message> @@ -23300,22 +23325,22 @@ <translation type="obsolete"><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> <source>Show &log</source> <translation>Показать &журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show the log of the local project</source> <translation>Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> @@ -23335,117 +23360,117 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show a dialog to browse the log of the local project</source> <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source>Show tip</source> <translation>Показать tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/> <source>Show the tip of the repository</source> <translation>Показать tip репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать tip</b><p>Показать tip репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Merge changes of a revision into the local project</source> <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> @@ -23470,7 +23495,7 @@ <translation type="obsolete"><b>Разрешить конфликты</b><p>Разрешить все конфликты в локальном проекте.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> <source>Show status</source> <translation>Показать статус</translation> </message> @@ -23480,187 +23505,187 @@ <translation type="obsolete">Показать &статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> <source>Re&vert changes</source> <translation>От&мена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения в локальном проекте</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>Tag in repository</source> <translation>Создать метку в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>&Tag in repository...</source> <translation>Создать &метку в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории метку для проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <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="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>List tags</source> <translation>Список меток</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>List tags...</source> <translation>Список меток...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>List tags of the project</source> <translation>Список меток текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <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="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <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="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <source>Create branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <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="478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480"/> <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="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <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="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <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="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <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="560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> <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> @@ -23685,22 +23710,22 @@ <translation type="obsolete"><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -23745,177 +23770,177 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <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="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <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="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> <source>Repository Administration</source> - <translation>Администрирование репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <translation type="obsolete">Администрирование репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <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="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <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="756"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <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="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> <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="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <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="765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <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="779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <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="793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> <source>Skip</source> <translation>Пропустить</translation> </message> @@ -23930,490 +23955,495 @@ <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <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="1054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> <source>Identify the project directory</source> <translation>Задайте каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <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="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Identify changegroup</source> <translation>Выбрать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Identify changegroup...</source> <translation>Выбрать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Выбрать файл содержащий коллекцию групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="827"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="215"/> <source>Push changes (force)</source> <translation>Послать изменения (принудительно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> <source>Push changes to a remote repository with force option</source> <translation>Послать изменения в удалённый репозиторий (принудительно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="223"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1033"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> <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="868"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> <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="1238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1241"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <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="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <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="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <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="597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> <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="604"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <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="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <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="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <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="627"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <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="793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <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="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1460"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <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="882"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <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="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1480"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <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="897"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <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="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="912"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <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="1497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1500"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <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="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> <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="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <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="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> <source>Conflicts resolved</source> <translation type="unfinished">Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> <source>Con&flicts resolved</source> <translation type="unfinished">Кон&фликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> <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="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> <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="951"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> <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="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="976"/> <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="1083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="984"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="984"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> <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="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <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="1010"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25238,6 +25268,36 @@ <source>Enter the password to acces the upstream (push) repository</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="151"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="157"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="164"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="170"/> + <source> MB</source> + <translation type="unfinished">MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="196"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="203"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -25641,7 +25701,7 @@ <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="361"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25650,7 +25710,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="363"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25659,7 +25719,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="365"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25732,7 +25792,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="240"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -25809,107 +25869,107 @@ <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="141"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="144"/> <source>modified</source> <translation>изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> <source>removed</source> <translation>удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> <source>not tracked</source> <translation>не отслеживается</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="143"/> <source>ignored</source> <translation>игнорировано</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="296"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="296"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="614"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="780"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="678"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="678"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>Remove from repository</source> <translation>Удалить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="701"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="742"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -25984,17 +26044,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="511"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -26004,27 +26064,27 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="614"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="80"/> <source>Select all for commit</source> <translation>Выбрать все для фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="82"/> <source>Deselect all from commit</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="237"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> @@ -26039,20 +26099,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="787"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="787"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="120"/> + <source>Add as Large File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> + <source>Add as Normal File</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -26090,202 +26160,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="106"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="106"/> <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/HgSummaryDialog.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="332"/> <source><tr><td><b>Parent</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="324"/> - <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> - <translation type="unfinished"><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="328"/> - <source><tr><td><b>Commit Message</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="334"/> - <source>empty repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="336"/> + <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> + <translation type="unfinished"><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="340"/> + <source><tr><td><b>Commit Message</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="346"/> + <source>empty repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="348"/> <source>no revision checked out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="337"/> - <source><tr><td><b>Remarks</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="341"/> - <source><tr><td><b>Branch</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="349"/> + <source><tr><td><b>Remarks</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="353"/> + <source><tr><td><b>Branch</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="361"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="356"/> - <source>{0} modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="358"/> - <source>{0} added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="360"/> - <source>{0} removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="362"/> - <source>{0} renamed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="364"/> - <source>{0} copied</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="366"/> - <source>{0} deleted</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="368"/> - <source>{0} unknown</source> + <source>{0} modified</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="370"/> - <source>{0} ignored</source> + <source>{0} added</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="372"/> - <source>{0} unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="375"/> - <source>{0} subrepos</source> + <source>{0} removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="374"/> + <source>{0} renamed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="376"/> + <source>{0} copied</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="378"/> - <source>Merge needed</source> + <source>{0} deleted</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="380"/> - <source>New Branch</source> + <source>{0} unknown</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="382"/> - <source>Head is closed</source> + <source>{0} ignored</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="384"/> - <source>No commit required</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="386"/> - <source>New Branch Head</source> + <source>{0} unresolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="387"/> - <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source> + <source>{0} subrepos</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="390"/> + <source>Merge needed</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="392"/> + <source>New Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="394"/> + <source>Head is closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="396"/> + <source>No commit required</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="398"/> + <source>New Branch Head</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="399"/> + <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="404"/> <source>current</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="407"/> - <source>unknown status</source> - <translation type="unfinished">статус неизвестен</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="408"/> - <source><tr><td><b>Update Status</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="413"/> - <source>synched</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="417"/> - <source>1 or more incoming</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="419"/> + <source>unknown status</source> + <translation type="unfinished">статус неизвестен</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="420"/> + <source><tr><td><b>Update Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="425"/> + <source>synched</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="429"/> + <source>1 or more incoming</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="431"/> <source>{0} outgoing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="428"/> - <source><tr><td><b>Remote Status</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="433"/> - <source>empty queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="437"/> - <source>{0} applied</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="440"/> + <source><tr><td><b>Remote Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="445"/> + <source>empty queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="449"/> + <source>{0} applied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="452"/> <source>{0} unapplied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="455"/> <source><tr><td><b>Queues Status</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="469"/> <source><p>No status information available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="328"/> <source><tr><td><b>Parent #{0}</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="406"/> <source>%n new changeset(s)<br/>Update required</source> <translation type="unfinished"> <numerusform></numerusform> @@ -26294,7 +26364,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="410"/> <source>%n new changeset(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -26303,7 +26373,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="412"/> <source>%n branch head(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -26312,13 +26382,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="414"/> <source>{0}<br/>{1}<br/>Merge required</source> <comment>0 is changesets, 1 is branch heads</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="434"/> <source>%n incoming bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -26327,7 +26397,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="437"/> <source>%n outgoing bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -26335,6 +26405,25 @@ <numerusform></numerusform> </translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="460"/> + <source>No files to upload</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="462"/> + <source>%n file(s) to upload</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="464"/> + <source><tr><td><b>Large Files</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgTagBranchListDialog</name> @@ -26696,55 +26785,90 @@ <translation type="unfinished">GPG</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> <source>Select to activate the Purge extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> - <source>Purge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> - <source>Select to activate the queues extension</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> - <source>Queues</source> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="160"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="163"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the rebase extension</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="150"/> - <source>Select to activate the transplant extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="153"/> - <source>Transplant</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> - <source>Select to activate the rebase extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="176"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="182"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="189"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="195"/> + <source> MB</source> + <translation type="unfinished">MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="221"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="228"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HistoryDialog</name> @@ -30935,6 +31059,210 @@ </message> </context> <context> + <name>Largefiles</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="70"/> + <source>Convert Project - Converting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="81"/> + <source>Convert Project - Extracting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="128"/> + <source>Adding files to the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="165"/> + <source>Pulling large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="194"/> + <source>Verifying the integrity of large files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LargefilesProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="47"/> + <source>Add as Large File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="52"/> + <source>Add as Normal File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="61"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="66"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="83"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LargefilesProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="33"/> + <source>Convert repository to largefiles</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="33"/> + <source>Convert repository to largefiles...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="37"/> + <source>Convert the repository of the project to a largefiles repository.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="40"/> + <source><b>Convert repository to largefiles</b><p>This converts the repository of the project to a largefiles repository. A new project is created. The current one is kept as a backup.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="50"/> + <source>Convert repository to normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="50"/> + <source>Convert repository to normal...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="54"/> + <source>Convert the repository of the project to a normal repository.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="57"/> + <source><b>Convert repository to normal</b><p>This converts the repository of the project to a normal repository. A new project is created. The current one is kept as a backup.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="67"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="72"/> + <source>Pull large files from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="75"/> + <source><b>Pull Large Files</b><p>This pulls missing large files from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="83"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="83"/> + <source>Show summary...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="88"/> + <source>Show summary information of the working directory status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="91"/> + <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="99"/> + <source>Verify large files of current revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="99"/> + <source>Verify large files of current revision...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="103"/> + <source>Verify that all large files in the current revision exist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="106"/> + <source><b>Verify large files of current revision</b><p>This verifies that all large files in the current revision exist.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="115"/> + <source>Verify large files of all revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="115"/> + <source>Verify large files of all revision...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="119"/> + <source>Verify that all large files in all revisions exist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="122"/> + <source><b>Verify large files of all revision</b><p>This verifies that all large files in all revisions exist.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="131"/> + <source>Verify large files contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="131"/> + <source>Verify large files contents...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="135"/> + <source>Verify the contents of all large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="138"/> + <source><b>Verify large files contents</b><p>This verifies the contents of all large files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="156"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="179"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>LexerAssociationDialog</name> <message> <location filename="../Project/LexerAssociationDialog.ui" line="13"/> @@ -31774,6 +32102,77 @@ </message> </context> <context> + <name>LfConvertDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="14"/> + <source>Convert Repository Format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="26"/> + <source>New project directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="33"/> + <source>Enter the directory name of the new project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="40"/> + <source>Press to select the new project directory name via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="47"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="54"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="60"/> + <source> MB</source> + <translation type="unfinished">MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="86"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="93"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py" line="75"/> + <source>New Project Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LfRevisionsInputDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui" line="14"/> + <source>Revisions Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui" line="23"/> + <source>Enter revisions to pull large files for (one per line):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Listspace</name> <message> <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="386"/> @@ -44880,187 +45279,187 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="348"/> <source>Push Next Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="240"/> <source>Push the next patch onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="243"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="364"/> <source>Push All Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="255"/> <source>Push all patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="258"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="380"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="271"/> <source>Push patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="397"/> <source>Pop Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="287"/> <source>Pop the current patch off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="288"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="290"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="414"/> <source>Pop All Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="302"/> <source>Pop all patches off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="305"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="430"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="318"/> <source>Pop patches off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="321"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="447"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="333"/> <source>Push or pop patches until named patch is at top of stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="336"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="352"/> <source>Push the next patch onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="355"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="368"/> <source>Push all patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="371"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="384"/> <source>Push patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="387"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="401"/> <source>Pop the current patch off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="404"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="418"/> <source>Pop all patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="421"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="434"/> <source>Pop patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="437"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="451"/> <source>Push or pop patches until named patch is at top of stack overwriting any local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="455"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack overwriting any local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="763"/> <source>Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="680"/> <source>Push/Pop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="692"/> <source>Push/Pop (force)</source> <translation type="unfinished"></translation> </message> @@ -45070,262 +45469,262 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="274"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="468"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="468"/> <source>Define Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="472"/> <source>Define guards for the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="475"/> <source><b>Define Guards</b><p>This opens a dialog to define guards for the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="484"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="484"/> <source>Drop All Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="488"/> <source>Drop all guards of the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="489"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="491"/> <source><b>Drop All Guards</b><p>This drops all guards of the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="499"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="499"/> <source>List Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="503"/> <source>List guards of the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="506"/> <source><b>List Guards</b><p>This lists the guards of the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="514"/> <source>List All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="514"/> <source>List All Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="518"/> <source>List all guards of all patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="521"/> <source><b>List All Guards</b><p>This lists all guards of all patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="529"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="529"/> <source>Set Active Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="533"/> <source>Set the list of active guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="536"/> <source><b>Set Active Guards</b><p>This opens a dialog to set the active guards.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="544"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="544"/> <source>Deactivate Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="548"/> <source>Deactivate all active guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="551"/> <source><b>Deactivate Guards</b><p>This deactivates all active guards.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="559"/> <source>Identify Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="559"/> <source>Identify Active Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="561"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="563"/> <source>Show a list of active guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="566"/> <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="704"/> <source>Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="578"/> <source>Create Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="582"/> <source>Create a new patch queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="585"/> <source><b>Create Queue</b><p>This creates a new patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="593"/> <source>Rename Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="597"/> <source>Rename the active patch queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="600"/> <source><b>Rename Queue</b><p>This renames the active patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="608"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="612"/> <source>Delete the reference to a patch queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="615"/> <source><b>Delete Queue</b><p>This deletes the reference to a patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="623"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="627"/> <source>Delete the reference to a patch queue and remove the patch directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="631"/> <source><b>Purge Queue</b><p>This deletes the reference to a patch queue and removes the patch directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="640"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="644"/> <source>Set the active queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="647"/> <source><b>Activate Queue</b><p>This sets the active queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="655"/> <source>List Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="655"/> <source>List Queues...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="659"/> <source>List the available queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="662"/> <source><b>List Queues</b><p>This opens a dialog showing all available queues.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="717"/> <source>Queue Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="819"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="819"/> <source>Changing Applied Patches</source> <translation type="unfinished"></translation> </message> @@ -46232,17 +46631,17 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="58"/> <source>Shelve changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="114"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="93"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -65987,17 +66386,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2076"/> <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="2084"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <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> @@ -66008,30 +66407,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <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="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> <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="2080"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> <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="1381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <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="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <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> @@ -66058,12 +66457,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> <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="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>