--- a/i18n/eric5_ru.ts Fri Sep 02 08:35:45 2011 +0200 +++ b/i18n/eric5_ru.ts Sat Sep 03 16:41:44 2011 +0200 @@ -15487,42 +15487,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> <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="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -15532,42 +15532,42 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> <translation>лог</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> @@ -15587,17 +15587,17 @@ <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> @@ -15732,7 +15732,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="465"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15830,12 +15830,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -16208,17 +16208,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="168"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16308,17 +16308,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <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/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="153"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16439,37 +16439,37 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> <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/HgClient.py" line="117"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> - <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> @@ -16691,12 +16691,12 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -16998,7 +16998,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="313"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> @@ -17073,17 +17073,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -17121,17 +17121,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1127"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -17247,27 +17247,27 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Deleted</source> - <translation>Удалено</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <source>Deleted</source> + <translation>Удалено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -17282,17 +17282,17 @@ <translation>Метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -17332,7 +17332,7 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>All</source> <translation>Все</translation> </message> @@ -17347,7 +17347,7 @@ <translation>лог (исходящий)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation type="unfinished">Закладки</translation> </message> @@ -17784,112 +17784,112 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="465"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> <translation>Копировать в репозитории</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move in repository</source> + <translation>Переместить в репозитории</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> - <source>Move in repository</source> - <translation>Переместить в репозитории</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> - <translation>Показать ограниченный журнал</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> + <translation type="obsolete">Показать ограниченный журнал</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="482"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="485"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> <translation>Разрешить конфликт</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local file entries</source> + <translation>Выделить все локальные файлы</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Select all versioned file entries</source> + <translation>Выделить все файлы с версиями (VCS)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <source>Select all local directory entries</source> + <translation>Выделить все локальные каталоги</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local file entries</source> - <translation>Выделить все локальные файлы</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned file entries</source> - <translation>Выделить все файлы с версиями (VCS)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Select all local directory entries</source> - <translation>Выделить все локальные каталоги</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="237"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> @@ -18099,385 +18099,385 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show limited log</source> - <translation>Показать ограниченный журнал</translation> + <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a limited log of the local project</source> - <translation>Показать ограниченный журнал изменений локального проекта</translation> + <translation type="obsolete">Показать ограниченный журнал изменений локального проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> + <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a dialog to browse the log of the local project</source> <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Show tip</source> <translation>Показать tip</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Show the tip of the repository</source> <translation>Показать tip репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать tip</b><p>Показать tip репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source>Merge changes of a revision into the local project</source> <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> <translation>Разрешить конфликты</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> <translation>Разрешить кон&фликты</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> <translation>Разрешить все конфликты, возникшие в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Разрешить конфликты</b><p>Разрешить все конфликты в локальном проекте.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show &status</source> <translation>Показать &статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation>От&мена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>Tag in repository</source> <translation>Создать метку в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation>Создать &метку в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории метку для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags</source> <translation>Список меток</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags...</source> <translation>Список меток...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>List tags of the project</source> <translation>Список меток текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список меток</b><p>Отображает список меток текущего проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветвь в репозитории для локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветвь</b><p>Закрыть ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключить</b><p>Переключить рабочий каталог на другую ревизию.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command options</source> <translation>Опции командной строки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command &options...</source> <translation>&Опции командной строки...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Показать опции командной строки Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -18522,292 +18522,292 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Пропустить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Пропустить текущие изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Задайте каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Каталог проекта</b><p>Задайте каталог проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Выбрать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Выбрать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Выбрать файл содержащий коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -18827,132 +18827,132 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> @@ -19033,37 +19033,37 @@ <translation type="unfinished">Удалить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="296"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -19137,17 +19137,17 @@ <translation type="unfinished">Commit сообщение</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -19165,12 +19165,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19255,17 +19255,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <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/QueuesExtension/HgQueuesListDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="222"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19285,7 +19285,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="295"/> <source>unknown</source> <translation type="unfinished">неизвестный</translation> </message> @@ -19328,7 +19328,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -20247,12 +20247,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="155"/> <source>Mercurial status checked successfully</source> <translation>Статус Mercurial успешно проверен</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="102"/> <source>Could not start the Mercurial process.</source> <translation>Невозможно запустить процесс Mercurial.</translation> </message> @@ -20344,32 +20344,32 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/> <source>Mercurial Branches List</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="90"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <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/HgTagBranchListDialog.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="250"/> <source>active</source> <translation>активный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="255"/> <source>yes</source> <translation>да</translation> </message> @@ -35203,57 +35203,57 @@ <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция кстановки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция установки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="983"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> @@ -35263,22 +35263,22 @@ <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> @@ -35308,12 +35308,12 @@ <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> @@ -35338,22 +35338,22 @@ <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> @@ -35363,33 +35363,33 @@ <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -35565,27 +35565,27 @@ <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -36402,12 +36402,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="549"/> <source>Author</source> <translation>Автор</translation> </message> @@ -37049,172 +37049,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> <source>Update from repository</source> <translation>Загрузить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="596"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> <source>Add tree to repository</source> <translation>Добавить дерево в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> <translation>Копировать в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> <translation>Переместить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="621"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="624"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <source>Revert changes</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <source>Merge changes</source> + <translation>Слияние изменений</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> - <source>Revert changes</source> - <translation>Отмена изменений</translation> + <source>Resolve conflict</source> + <translation>Разрешить конфликт</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> - <source>Merge changes</source> - <translation>Слияние изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="639"/> - <source>Resolve conflict</source> - <translation>Разрешить конфликт</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="642"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> + <source>Select all local file entries</source> + <translation>Выделить все локальные файлы</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> + <source>Select all versioned file entries</source> + <translation>Выделить все файлы с версиями (VCS)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> + <source>Select all local directory entries</source> + <translation>Выделить все локальные каталоги</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="649"/> - <source>Select all local file entries</source> - <translation>Выделить все локальные файлы</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> - <source>Select all versioned file entries</source> - <translation>Выделить все файлы с версиями (VCS)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> - <source>Select all local directory entries</source> - <translation>Выделить все локальные каталоги</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="513"/> <source>Show limited log</source> - <translation>Показать ограниченный журнал</translation> + <translation type="obsolete">Показать ограниченный журнал</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <source>Lock</source> + <translation>Захватить</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> - <source>Lock</source> - <translation>Захватить</translation> + <source>Unlock</source> + <translation>Освободить</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> - <source>Unlock</source> - <translation>Освободить</translation> + <source>Break Lock</source> + <translation>Нарушить захват</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> - <source>Break Lock</source> - <translation>Нарушить захват</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="400"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference (URLs)</source> <translation>Показать разницу (URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="516"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="610"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> <source>Add to Changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> @@ -37342,359 +37342,359 @@ <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Показать различие</b> <p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show &status</source> <translation>Показать &статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="209"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>Tag in repository</source> <translation>Создать тег в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>&Tag in repository...</source> <translation>&Создать тег в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории тег для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="241"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Создать тег</b><p>Создаёт тег для локального проекта в репозитории.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command options</source> + <translation>Опции командной строки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command &options...</source> + <translation>&Опции командной строки...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> + <source>Show the VCS command options</source> + <translation>Показать опции командной строки VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Revert changes</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Re&vert changes</source> + <translation>От&мена изменений</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command &options...</source> - <translation>&Опции командной строки...</translation> + <source>Revert all changes made to the local project</source> + <translation>Отменить все изменения в локальном проекте</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> - <source>Show the VCS command options</source> - <translation>Показать опции командной строки VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Revert changes</source> - <translation>Отмена изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Re&vert changes</source> - <translation>От&мена изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <source>Revert all changes made to the local project</source> - <translation>Отменить все изменения в локальном проекте</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения тега/ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> <source>Switch the local copy to another tag/branch</source> <translation>Переключить локальную копию на другой тег/ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Переключиться</b><p>Переключить локальную копию на другой тег/ветвь.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> <translation>Разрешение кон&фликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> <translation>Разрешить все конфликты, возникшие в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Разрешение конфликтов</b><p>Разрешает конфликты, возникшие при обновлении локальной копии с репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute an arbitrary VCS command</source> <translation>Выполнить произвольную команду VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> <source>List tags of the project</source> <translation>Список тегов текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список тегов</b><p>Отображает список тегов текущего проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Список ветвей</b> <p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents</source> <translation>Просмотреть содержимое репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents...</source> <translation>Просмотреть содержимое репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> <source>Lists the contents of the repository</source> <translation>Просмотреть содержимое репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Просмотреть содержимое репозитория<b><p>Просмотреть содержимое репозитория системы контроля версий.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property...</source> <translation>Установить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> <source>Set a property for the project files</source> <translation>Установить свойство файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Установить свойство</b><p>Устанавливает свойство файлов проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties...</source> <translation>Список свойств...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> <source>List properties of the project files</source> <translation>Список свойств файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Список свойств</b><p>Отображает список свойств файлов проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property...</source> <translation>Удалить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> <source>Delete a property for the project files</source> <translation>Удалить свойство для файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Удалить свойство</b> <p>Удаляет свойство для файлов проекта.</p></translation> @@ -37702,120 +37702,120 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> <source>Show limited log</source> - <translation>Показать ограниченный журнал</translation> + <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> <source>Show a limited log of the local project</source> - <translation>Показать ограниченный журнал изменений локального проекта</translation> + <translation type="obsolete">Показать ограниченный журнал изменений локального проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> <source>Show some repository related information for the local project</source> <translation>Отобразить информацию о репозизтории локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate</source> <translation>Переместить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>Переместить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="436"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> <source>Relocate the working copy to a new repository URL</source> <translation>Переместить рабочую копию в репозиторий с новым URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="439"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Переместить</b><p>Переместить рабочую копию в репозиторий с новым URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Информация о репозитории</b><p>Отобразить информацию о репозитории локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> <source>Show difference (URLs)</source> <translation>Показать разницу (URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> <source>Show the difference of the project between two repository URLs</source> <translation>Показать разницу между двумя репозиториями</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Показать разницу (URL)</b><p>Показывает разницу между репозиториями, заданными двумя URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> <source>Repository Browser...</source> <translation>Проводник репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> <source>Show the Repository Browser dialog</source> <translation>Показать диалог проводника репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Проводник репозитория</b><p>Показывает проводник репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> <source>Show a dialog to browse the log of the local project</source> <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Subversion.</p></translation> </message> @@ -49120,14 +49120,14 @@ <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> <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="1184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1201"/> <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> @@ -49137,7 +49137,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49398,17 +49398,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</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><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>