--- a/i18n/eric5_ru.ts Sun Jun 10 17:55:19 2012 +0200 +++ b/i18n/eric5_ru.ts Sun Jun 10 18:18:24 2012 +0200 @@ -19936,40 +19936,40 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> - <translation>Удаление из репозитория (и с диска)</translation> + <translation type="obsolete">Удаление из репозитория (и с диска)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> - <translation>&Удалить из репозитория (и с диска)</translation> + <translation type="obsolete">&Удалить из репозитория (и с диска)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> - <translation>Удалить локальный проект из репозитория (и диска)</translation> + <translation type="obsolete">Удалить локальный проект из репозитория (и диска)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> - <translation><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <translation type="obsolete"><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Show &log</source> <translation>Показать &журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Show the log of the local project</source> <translation>Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> @@ -19989,117 +19989,117 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="236"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <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="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <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="267"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <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="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="270"/> <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="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> <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="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> <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="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> <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="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show tip</source> <translation>Показать tip</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source>Show the tip of the repository</source> <translation>Показать tip репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> <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="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Merge changes of a revision into the local project</source> <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> @@ -20124,237 +20124,237 @@ <translation type="obsolete"><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 status</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 &status</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 status of the local project</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 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="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Re&vert changes</source> <translation>От&мена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> <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="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Tag in repository</source> <translation>Создать метку в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>&Tag in repository...</source> <translation>Создать &метку в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории метку для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <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="403"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>List tags</source> <translation>Список меток</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>List tags...</source> <translation>Список меток...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> <source>List tags of the project</source> <translation>Список меток текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> <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="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> <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="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> <source>Create branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> <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="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> <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="458"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> <source>Close 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>Close the current branch of the local project</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>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="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="469"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="476"/> <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="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <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="511"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> <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="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Command options</source> <translation>Опции командной строки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Command &options...</source> <translation>&Опции командной строки...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Show the Mercurial command options</source> <translation>Показать опции командной строки Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <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="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -20399,177 +20399,177 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <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="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <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="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <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="893"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1239"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> <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="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <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="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <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="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Mark a selectable changeset as good</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>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="723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <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="736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source>Skip</source> <translation>Пропустить</translation> </message> @@ -20584,107 +20584,107 @@ <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <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="937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="922"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source>Identify the project directory</source> <translation>Задайте каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <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="671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <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="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Identify 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>Identify 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>Identify a changegroup file containing a collection of changesets</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>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="762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -20704,277 +20704,277 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <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="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> <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="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <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="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> <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="945"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <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="554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <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="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <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="567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <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="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <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="581"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="827"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> @@ -41365,216 +41365,216 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> - <translation>Удаление из репозитория (и с диска)</translation> + <translation type="obsolete">Удаление из репозитория (и с диска)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> - <translation>&Удалить из репозитория (и с диска)</translation> + <translation type="obsolete">&Удалить из репозитория (и с диска)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> - <translation>Удалить локальный проект из репозитория (и диска)</translation> + <translation type="obsolete">Удалить локальный проект из репозитория (и диска)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> - <translation><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> + <translation type="obsolete"><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Show &log</source> <translation>Показать &журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Show the log of the local project</source> <translation>Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="119"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="123"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="126"/> <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="148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="133"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="137"/> <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="155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="140"/> <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="177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show &status</source> <translation>Показать &статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <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="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Создать тег в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>&Создать тег в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории тег для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <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="235"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> <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="234"/> + <source>Command options</source> + <translation>Опции командной строки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>&Опции командной строки...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> + <source>Show the VCS command options</source> + <translation>Показать опции командной строки VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> + <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="245"/> + <source>Revert changes</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> + <source>Re&vert changes</source> + <translation>От&мена изменений</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> - <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="252"/> - <source>Show the VCS command options</source> - <translation>Показать опции командной строки VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="253"/> - <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="260"/> - <source>Revert changes</source> - <translation>Отмена изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="260"/> - <source>Re&vert changes</source> - <translation>От&мена изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="264"/> - <source>Revert all changes made to the local project</source> - <translation>Отменить все изменения в локальном проекте</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="267"/> <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="274"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <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="288"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Переключить локальную копию на другой тег/ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Переключиться</b><p>Переключить локальную копию на другой тег/ветвь.</p></translation> </message> @@ -41599,163 +41599,163 @@ <translation type="obsolete"><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>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Cleanup 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>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="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> <source>Execute an arbitrary VCS command</source> <translation>Выполнить произвольную команду VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> <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="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>List tags of the project</source> <translation>Список тегов текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> <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="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List branches</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 branches...</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 branches 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 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="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List repository contents</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 repository contents...</source> <translation>Просмотреть содержимое репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> <source>Lists the contents of the repository</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 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="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>Set Property...</source> <translation>Установить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> <source>Set a property for the project files</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>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="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>List Properties...</source> <translation>Список свойств...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> <source>List properties of 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>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="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>Delete Property...</source> <translation>Удалить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> <source>Delete a property for 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>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Удалить свойство</b> <p>Удаляет свойство для файлов проекта.</p></translation> @@ -41776,142 +41776,142 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> - <source>Show some repository related information for the local project</source> - <translation>Отобразить информацию о репозизтории локального проекта</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> - <source>Relocate</source> - <translation>Переместить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> - <source>Relocate...</source> - <translation>Переместить...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="423"/> - <source>Relocate the working copy to a new repository URL</source> - <translation>Переместить рабочую копию в репозиторий с новым URL</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="426"/> - <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="213"/> - <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="162"/> - <source>Show difference (URLs)</source> - <translation>Показать разницу (URL)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> - <source>Show the difference of the project between two repository URLs</source> - <translation>Показать разницу между двумя репозиториями</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> - <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="433"/> - <source>Repository Browser</source> - <translation>Проводник репозитория</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="433"/> - <source>Repository Browser...</source> - <translation>Проводник репозитория...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="437"/> - <source>Show the Repository Browser dialog</source> - <translation>Показать диалог проводника репозитория</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="440"/> - <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="118"/> - <source>Show log browser</source> - <translation>Показать проводник журналов</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> - <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="125"/> - <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="447"/> - <source>Configure</source> - <translation>Настроить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> - <source>Configure...</source> - <translation>Настроить...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Показать диалог настроек с выбранной страницей настроек Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> - <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> - <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Subversion.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="302"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> - <source>Show change lists</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> - <source>Show the change lists and associated files of the local project</source> - <translation type="unfinished"></translation> + <source>Show some repository related information for the local project</source> + <translation>Отобразить информацию о репозизтории локального проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <source>Relocate</source> + <translation>Переместить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <source>Relocate...</source> + <translation>Переместить...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <source>Relocate the working copy to a new repository URL</source> + <translation>Переместить рабочую копию в репозиторий с новым URL</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> + <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="198"/> + <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="147"/> + <source>Show difference (URLs)</source> + <translation>Показать разницу (URL)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <source>Show the difference of the project between two repository URLs</source> + <translation>Показать разницу между двумя репозиториями</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <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="418"/> + <source>Repository Browser</source> + <translation>Проводник репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <source>Repository Browser...</source> + <translation>Проводник репозитория...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Показать диалог проводника репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <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="103"/> + <source>Show log browser</source> + <translation>Показать проводник журналов</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="107"/> + <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="110"/> + <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="432"/> + <source>Configure</source> + <translation>Настроить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Показать диалог настроек с выбранной страницей настроек Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> + <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> + <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Subversion.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> + <source>Show change lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="180"/> + <source>Show the change lists and associated files of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="183"/> <source><b>Show change lists</b><p>This shows the change lists and associated files of the local project.</p></source> <translation type="unfinished"></translation> </message>