diff -r c3d784c057b3 -r 1a68ecb67c06 i18n/eric5_ru.ts --- a/i18n/eric5_ru.ts Wed Feb 19 19:45:06 2014 +0100 +++ b/i18n/eric5_ru.ts Wed Feb 19 19:52:16 2014 +0100 @@ -19805,42 +19805,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="1793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="374"/> <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="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="593"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="646"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="787"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1068"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <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="1949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <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="1004"/> + <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="1322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1328"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2165"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2288"/> + <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="2314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2373"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2632"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2398"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <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="2725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2796"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2775"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2505"/> <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="2813"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2823"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2816"/> <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="532"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="538"/> <source>Committing changes to Mercurial repository</source> <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3322"/> <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="3466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2892"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2988"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3069"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3187"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3220"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3168"/> <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="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <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="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3208"/> <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="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <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="998"/> + <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="989"/> + <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="998"/> + <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="3095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <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="1796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1802"/> <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="946"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="952"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -22056,7 +22056,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> <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="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1344"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1341"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -22212,27 +22212,27 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="114"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="778"/> + <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="778"/> + <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="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="573"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="576"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="579"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -22297,22 +22297,22 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> <source>Mercurial Log (Incoming)</source> <translation>лог (входящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> <source>Mercurial Log (Outgoing)</source> <translation>лог (исходящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <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="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> <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="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="142"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> <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="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="140"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1503"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1540"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -22378,27 +22378,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Tag</source> <translation type="unfinished">Метка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1540"/> <source>Switch</source> <translation type="unfinished">Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> @@ -26467,12 +26467,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="150"/> <source>Select to activate the transplant extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="153"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> @@ -26481,6 +26481,16 @@ <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> </context> <context> <name>HistoryDialog</name> @@ -48313,7 +48323,7 @@ <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1774"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1777"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> @@ -48383,12 +48393,12 @@ <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2261"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2301"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> @@ -48414,17 +48424,17 @@ <translation>Свойство удалено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2241"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2241"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2349"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -48585,42 +48595,42 @@ <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="178"/> <source>The svn process finished with the exit code {0}</source> <translation>Процесс svn завершился с кодом {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1963"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1966"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="185"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2374"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2375"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2374"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2375"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2400"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2436"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2437"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2426"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -48670,7 +48680,7 @@ <translation type="obsolete">Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1966"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1969"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -48685,7 +48695,7 @@ <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2495"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2496"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -49598,12 +49608,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="612"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="573"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="609"/> <source>Author</source> <translation>Автор</translation> </message> @@ -49613,7 +49623,7 @@ <translation>Дата</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="133"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -49673,22 +49683,22 @@ <translation>&Сравнить версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="494"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> @@ -49744,12 +49754,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="281"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="281"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -49794,7 +49804,7 @@ <translation>Стоп при копировании/перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> <source>Replaced</source> <translation>Заменено</translation> </message> @@ -65474,17 +65484,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <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="2090"/> - <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="2099"/> + <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="2108"/> <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> @@ -65495,30 +65505,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084"/> <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="2095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104"/> <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="1391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> <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="1411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1417"/> <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> @@ -65545,12 +65555,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <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="1451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -65998,7 +66008,7 @@ <translation>неизвестный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1591"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1594"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message>