--- a/i18n/eric5_ru.ts Mon Feb 17 18:23:44 2014 +0100 +++ b/i18n/eric5_ru.ts Mon Feb 17 19:05:07 2014 +0100 @@ -2279,7 +2279,7 @@ <translation><b>Протолкнуть закладки</b><p>Протолкнуть закладку из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="219"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> @@ -4228,17 +4228,17 @@ <context> <name>CompareDialog</name> <message> - <location filename="../UI/CompareDialog.py" line="249"/> + <location filename="../UI/CompareDialog.py" line="247"/> <source>Compare Files</source> <translation>Сравнить файлы</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="444"/> + <location filename="../UI/CompareDialog.py" line="442"/> <source>Select file to compare</source> <translation>Задайте файл для сравнения</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="249"/> + <location filename="../UI/CompareDialog.py" line="247"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> @@ -4313,22 +4313,22 @@ <translation>Сравнить</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="356"/> + <location filename="../UI/CompareDialog.py" line="354"/> <source>Total: {0}</source> <translation>Итого: {0}</translation> </message> <message> + <location filename="../UI/CompareDialog.py" line="356"/> + <source>Changed: {0}</source> + <translation>Изменено: {0}</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="357"/> + <source>Added: {0}</source> + <translation>Добавлено: {0}</translation> + </message> + <message> <location filename="../UI/CompareDialog.py" line="358"/> - <source>Changed: {0}</source> - <translation>Изменено: {0}</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="359"/> - <source>Added: {0}</source> - <translation>Добавлено: {0}</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="360"/> <source>Deleted: {0}</source> <translation>Удалено: {0}</translation> </message> @@ -9579,7 +9579,7 @@ <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6297"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -9659,7 +9659,7 @@ <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6292"/> + <location filename="../QScintilla/Editor.py" line="6297"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -9709,72 +9709,72 @@ <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6313"/> + <location filename="../QScintilla/Editor.py" line="6318"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6315"/> + <location filename="../QScintilla/Editor.py" line="6320"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6317"/> - <source>Add files...</source> - <translation>Добавить файлы...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6319"/> - <source>Add aliased file...</source> - <translation>Добавить файл под другим именем...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6322"/> + <source>Add files...</source> + <translation>Добавить файлы...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6324"/> + <source>Add aliased file...</source> + <translation>Добавить файл под другим именем...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6327"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6345"/> + <location filename="../QScintilla/Editor.py" line="6350"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6361"/> + <location filename="../QScintilla/Editor.py" line="6366"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6389"/> + <location filename="../QScintilla/Editor.py" line="6394"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6389"/> + <location filename="../QScintilla/Editor.py" line="6394"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6453"/> + <location filename="../QScintilla/Editor.py" line="6458"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6487"/> + <location filename="../QScintilla/Editor.py" line="6492"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6487"/> + <location filename="../QScintilla/Editor.py" line="6492"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6326"/> + <location filename="../QScintilla/Editor.py" line="6331"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> @@ -9834,12 +9834,12 @@ <translation>Не задан формат экспорта. Отмена...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6473"/> + <location filename="../QScintilla/Editor.py" line="6478"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6473"/> + <location filename="../QScintilla/Editor.py" line="6478"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> @@ -9919,7 +9919,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6775"/> + <location filename="../QScintilla/Editor.py" line="6780"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -9929,12 +9929,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6778"/> + <location filename="../QScintilla/Editor.py" line="6783"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6780"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -10054,12 +10054,12 @@ <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7191"/> + <location filename="../QScintilla/Editor.py" line="7196"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7191"/> + <location filename="../QScintilla/Editor.py" line="7196"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> @@ -14809,12 +14809,12 @@ <translation><b>Получить изменения</b><p>Затянуть изменения из удаленного в локальный репозиторий. Если изменения затянуты с новой головной ветки, эта глова автоматически объединяется, и результат фиксируется. В противном случае рабочий каталог обновляется содержащимися новыми изменениями</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="91"/> <source>Fetch</source> <translation>Запрос</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="91"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -19805,42 +19805,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="237"/> <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="1786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <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="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="587"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="640"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1532"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1539"/> <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="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2003"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <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="997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1322"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2288"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2622"/> + <source>Shall the working directory be updated?</source> + <translation>Обновить рабочий каталог?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> + <source>Showing current branch</source> + <translation>Текущая ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2635"/> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2653"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Неправильная подкоманда ({0}) для Bisect.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> + <source>Preview changegroup</source> + <translation>Предпросмотр группы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2389"/> + <source>Identifying project directory</source> + <translation>Каталог проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <source>Create .hgignore file</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <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"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Удаление файлов только из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial файлы изменений (*.hg)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> - <source>Shall the working directory be updated?</source> - <translation>Обновить рабочий каталог?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> - <source>Showing current branch</source> - <translation>Текущая ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2515"/> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2627"/> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Неправильная подкоманда ({0}) для Bisect.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2683"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2571"/> - <source>Preview changegroup</source> - <translation>Предпросмотр группы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> - <source>Identifying project directory</source> - <translation>Каталог проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417"/> - <source>Create .hgignore file</source> - <translation>Создать файл .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417"/> - <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="2717"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Удаление файлов только из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial файлы изменений (*.hg)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2606"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2757"/> + <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="2488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/> <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="2805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2806"/> <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="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="532"/> <source>Committing changes to Mercurial repository</source> <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3466"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3312"/> <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="3392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3466"/> <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="2874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2882"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2978"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3210"/> <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="3150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> <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="3221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <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="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="464"/> <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="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="998"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> <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="991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="998"/> <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="3087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <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="1789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1796"/> <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="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="946"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -22061,37 +22061,37 @@ <translation>Mercurial Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="25"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="22"/> <source>From:</source> <translation>От:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="32"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="29"/> <source>Enter the start date</source> <translation>Задайте начальную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="39"/> <source>To:</source> <translation>До:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="46"/> <source>Enter the end date</source> <translation>Задайте конечную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="99"/> <source>Select the field to filter on</source> <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1304"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/> <source>Author</source> <translation>Автор</translation> </message> @@ -22101,113 +22101,113 @@ <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="121"/> <source>Enter the regular expression to filter on</source> <translation>Задайте регулярное выражения для фильтра</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="230"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> <source>Copy from</source> <translation>Копировать из</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> + <source>Press to get the next bunch of log entries</source> + <translation>Нажмите для получения следующей части сообщений журнала</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="253"/> - <source>Press to get the next bunch of log entries</source> - <translation>Нажмите для получения следующей части сообщений журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="256"/> <source>&Next</source> <translation>&Далее</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Enter the limit of entries to fetch</source> <translation>Задайте максимальное количество записей</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> - <source>Select to stop listing log messages at a copy or move</source> - <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="298"/> <source>Stop on Copy/Move</source> <translation>Стоп при копировании/перемещении</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> + <source>Press to compare two revisions</source> + <translation>Нажмите, чтобы сравнить две версии</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> - <source>Press to compare two revisions</source> - <translation>Нажмите, чтобы сравнить две версии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="328"/> <source>&Compare Revisions</source> <translation>&Сравнить версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="386"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> <source>Input</source> <translation>Ввод</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <source>Press to send the input to the hg process</source> + <translation>Отправить данные процессу hg</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> - <source>Press to send the input to the hg process</source> - <translation>Отправить данные процессу hg</translation> + <source>&Send</source> + <translation>&Отправить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> <source>Alt+S</source> <translation>Alt+О</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Enter data to be sent to the hg process</source> <translation>Задайте данные, которые будут посланы процессу hg</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="456"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> @@ -22227,72 +22227,72 @@ <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="778"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="778"/> <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/HgLogBrowserDialog.ui" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="157"/> <source>Branch</source> <translation>Ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="545"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="548"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="551"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="152"/> <source>Graph</source> <translation>Граф</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="302"/> + <source>Press to generate a diff to the first parent revision</source> + <translation>Создание сравнения с предыдущей версией</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="305"/> - <source>Press to generate a diff to the first parent revision</source> - <translation>Создание сравнения с предыдущей версией</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="308"/> <source>Diff to Parent &1</source> <translation>Сравнить с предком &1</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> + <source>Press to generate a diff to the second parent revision</source> + <translation>Создание сравнения с пред-предыдущей версией</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> - <source>Press to generate a diff to the second parent revision</source> - <translation>Создание сравнения с пред-предыдущей версией</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="318"/> <source>Diff to Parent &2</source> <translation>Сравнить с предком &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="69"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="76"/> <source>Select the branch to filter on</source> <translation>Задайте ветвь, по которой фильтровать</translation> </message> @@ -22332,48 +22332,48 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="167"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="151"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/> <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="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="149"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1458"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1495"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="364"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> @@ -22383,15 +22383,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> <source>Tag</source> <translation type="unfinished">Метка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1495"/> + <source>Switch</source> + <translation type="unfinished">Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -22471,111 +22481,111 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="216"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="216"/> <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/HgLogDialog.py" line="307"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="344"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="356"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="359"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="365"/> <source>Parents: {0}<br /> </source> <translation>Предки: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="368"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Автор: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="372"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="388"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="394"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="400"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="274"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="274"/> - <source>Could not start the hg executable.</source> - <translation>Невозможно запустить исполняемый файл hg.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="277"/> + <source>Could not start the hg executable.</source> + <translation>Невозможно запустить исполняемый файл hg.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="280"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="383"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="362"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="353"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -23825,7 +23835,7 @@ <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> @@ -24060,12 +24070,12 @@ <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="1252"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -24175,7 +24185,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1471"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> @@ -24200,7 +24210,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1491"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -24245,7 +24255,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -24280,7 +24290,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -49598,7 +49608,7 @@ <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="122"/> <source>Date</source> <translation>Дата</translation> </message> @@ -49608,57 +49618,57 @@ <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="170"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="175"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="183"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="180"/> <source>Copy from</source> <translation>Копировать из</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="188"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="185"/> <source>Copy from Rev</source> <translation>Копировать из версии</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="195"/> + <source>Press to get the next bunch of log entries</source> + <translation>Нажмите для получения следующей части сообщений журнала</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="198"/> - <source>Press to get the next bunch of log entries</source> - <translation>Нажмите для получения следующей части сообщений журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="201"/> <source>&Next</source> <translation>&Далее</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="205"/> <source>Enter the limit of entries to fetch</source> <translation>Задайте максимальное количество записей</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to generate a diff to the previous revision</source> + <translation>Создания сравнение с предыдущей версией</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> - <source>Press to generate a diff to the previous revision</source> - <translation>Создания сравнение с предыдущей версией</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="247"/> <source>&Diff to Previous</source> <translation>&Сравнить с предыдущей</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to compare two revisions</source> + <translation>Нажмите, чтобы сравнить две версии</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>Press to compare two revisions</source> - <translation>Нажмите, чтобы сравнить две версии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="257"/> <source>&Compare Revisions</source> <translation>&Сравнить версии</translation> </message> @@ -49683,53 +49693,53 @@ <translation>Ошибка Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды <tt>cvn log</tt>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> <source>Input</source> <translation>Ввод</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> + <source>Press to send the input to the subversion process</source> + <translation>Отправить данные процессу subversion</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>Press to send the input to the subversion process</source> - <translation>Отправить данные процессу subversion</translation> + <source>&Send</source> + <translation>&Отправить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="345"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> <source>Enter data to be sent to the subversion process</source> <translation>Задайте данные, которые будут посланы процессу subversion</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Password Mode</source> + <translation>&Парольный режим</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> - <source>&Password Mode</source> - <translation>&Парольный режим</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="365"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -49744,42 +49754,42 @@ <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="25"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="22"/> <source>From:</source> <translation>От:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="32"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="29"/> <source>Enter the start date</source> <translation>Задайте начальную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="39"/> <source>To:</source> <translation>До:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="46"/> <source>Enter the end date</source> <translation>Задайте конечную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="56"/> <source>Select the field to filter on</source> <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="78"/> <source>Enter the regular expression to filter on</source> <translation>Задайте регулярное выражения для фильтра</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="224"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="227"/> - <source>Select to stop listing log messages at a copy or move</source> - <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="230"/> <source>Stop on Copy/Move</source> <translation>Стоп при копировании/перемещении</translation> </message> @@ -49789,12 +49799,12 @@ <translation>Заменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> @@ -54513,82 +54523,82 @@ <context> <name>TabWidget</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="245"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="248"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="251"/> - <source>Close All</source> - <translation>Закрыть всё</translation> - </message> - <message> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="254"/> - <source>Save</source> - <translation>Сохранить</translation> + <source>Close All</source> + <translation>Закрыть всё</translation> </message> <message> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="257"/> - <source>Save As...</source> - <translation>Сохранить как...</translation> + <source>Save</source> + <translation>Сохранить</translation> </message> <message> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="260"/> + <source>Save As...</source> + <translation>Сохранить как...</translation> + </message> + <message> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="263"/> <source>Save All</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="268"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="271"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="415"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="418"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="232"/> - <source>Move Left</source> - <translation>Сдвинуть влево</translation> - </message> - <message> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="235"/> - <source>Move Right</source> - <translation>Сдвинуть вправо</translation> - </message> - <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="201"/> - <source>Close the current editor</source> - <translation>Закрыть текущий редактор</translation> + <source>Move Left</source> + <translation>Сдвинуть влево</translation> </message> <message> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="238"/> - <source>Move First</source> - <translation>Сделать первым</translation> + <source>Move Right</source> + <translation>Сдвинуть вправо</translation> + </message> + <message> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="204"/> + <source>Close the current editor</source> + <translation>Закрыть текущий редактор</translation> </message> <message> <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="241"/> + <source>Move First</source> + <translation>Сделать первым</translation> + </message> + <message> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="244"/> <source>Move Last</source> <translation>Сделать последним</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="191"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="194"/> <source>Show a navigation menu</source> <translation>Показать меню</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="248"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="251"/> <source>Close Others</source> <translation>Закрыть остальные</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="272"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="275"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="264"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="267"/> <source>Open 'rejection' file</source> <translation>Открыть 'отбракованный' файл</translation> </message> @@ -54711,12 +54721,12 @@ <context> <name>Tabview</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="897"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="900"/> <source>Untitled {0}</source> <translation>Без имени - {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1235"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1242"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> @@ -62925,17 +62935,17 @@ <translation>Открыть &закладки на файлы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4862"/> + <location filename="../ViewManager/ViewManager.py" line="4863"/> <source>&Clear</source> <translation>&Очистить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4856"/> + <location filename="../ViewManager/ViewManager.py" line="4857"/> <source>&Add</source> <translation>&Добавить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4859"/> + <location filename="../ViewManager/ViewManager.py" line="4860"/> <source>&Edit...</source> <translation>&Правка...</translation> </message> @@ -64591,27 +64601,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6049"/> + <location filename="../ViewManager/ViewManager.py" line="6050"/> <source>Edit Spelling Dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6024"/> + <location filename="../ViewManager/ViewManager.py" line="6025"/> <source>Editing {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6009"/> + <location filename="../ViewManager/ViewManager.py" line="6010"/> <source><p>The spelling dictionary file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6036"/> + <location filename="../ViewManager/ViewManager.py" line="6037"/> <source><p>The spelling dictionary file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6049"/> + <location filename="../ViewManager/ViewManager.py" line="6050"/> <source>The spelling dictionary was saved successfully.</source> <translation type="unfinished"></translation> </message> @@ -65464,17 +65474,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <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="2082"/> + <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="2091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/> <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> @@ -65485,30 +65495,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <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="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <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="2087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> <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="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1411"/> <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> @@ -65535,12 +65545,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <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="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1451"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>