--- a/i18n/eric5_ru.ts Sat Jun 02 17:41:24 2012 +0200 +++ b/i18n/eric5_ru.ts Sun Jun 03 12:51:15 2012 +0200 @@ -39093,223 +39093,223 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="315"/> <source>Importing project into Subversion repository</source> <translation>Импорт проекта в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="365"/> <source>Subversion Checkout</source> <translation>Закрузка из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Тег должен быть обычным тегом (tag) или ветвью (branch). Пожалуйста, выберите из списка.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="386"/> <source>Checking project out of Subversion repository</source> <translation>Загрузка проекта из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="427"/> <source>Subversion Export</source> <translation>Экспорт из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="447"/> <source>Exporting project from Subversion repository</source> <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="988"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция кстановки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция установки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1047"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1127"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1149"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1251"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1528"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1564"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1710"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="884"/> <source>Moving {0}</source> <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1810"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1828"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1648"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="531"/> <source>Commiting changes to Subversion repository</source> <translation>Фиксация изменений в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="587"/> <source>Synchronizing with the Subversion repository</source> <translation>Синхронизация с репозиторием Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="688"/> <source>Adding files/directories to the Subversion repository</source> <translation>Добавляю файлы/каталоги в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="787"/> <source>Adding directory trees to the Subversion repository</source> <translation>Добавляю деревья каталогов в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="822"/> <source>Removing files/directories from the Subversion repository</source> <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1076"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1671"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>Create project in repository</source> <translation>Создать проект в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="223"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Невозможно создать проект в репозитории. Возможно данный репозиторий не существует или сервер не функционирует.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="245"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1994"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2032"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="556"/> <source>Committed revision {0}.</source> <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1156"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1793"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1843"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1974"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -39464,48 +39464,48 @@ <translation>нет версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="331"/> <source>Imported revision {0}. </source> <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="193"/> <source>The svn process finished with the exit code {0}</source> <translation>Процесс svn завершился с кодом {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="198"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2103"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2127"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2164"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2153"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -39720,6 +39720,96 @@ </message> </context> <context> + <name>SvnChangeListsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="14"/> + <source>Subversion Change Lists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="23"/> + <source>Change Lists:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="36"/> + <source><b>Change Lists</b> +<p>Select a change list here to see the associated files in the list below.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="63"/> + <source><b>Files</b> +<p>This shows a list of files associated with the change list selected above.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="80"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="99"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="121"/> + <source>Press to send the input to the subversion process</source> + <translation type="unfinished">Отправить данные процессу subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="124"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="127"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="134"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="unfinished">Задайте данные, которые будут посланы процессу subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="141"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="144"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.ui" line="147"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="75"/> + <source>Files (relative to {0}):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="138"/> + <source>No changelists found</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py" line="109"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SvnCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> @@ -39810,56 +39900,61 @@ <context> <name>SvnCommitDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="25"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="26"/> <source>Enter the log message.</source> <translation>Задайте сообщение для журнала.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="28"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="29"/> <source><b>Log Message</b> <p>Enter the log message for the commit action.</p></source> <translation><b>Сообщение для журнала</b> <p>Задайте сообщение, описывающее сохраняемые изменения</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="14"/> <source>Subversion</source> <translation>Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="42"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="43"/> <source>Recent commit messages</source> <translation>Недавние комментарии к фиксациям</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="49"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="50"/> <source>Select a recent commit message to use</source> <translation>Выберите недавнее сообщение</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="19"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="20"/> <source>Commit Message</source> <translation>Commit сообщение</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="60"/> <source>Changelists</source> <translation>Список изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="72"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="73"/> <source>Select to keep the changelists</source> <translation>Сохранить список изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="75"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="76"/> <source>Keep changelists</source> <translation>Сохранить список изменений</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="65"/> <source>Enter the list of changelists separated by ';'</source> - <translation>Введите список списков изменений</translation> + <translation type="obsolete">Введите список списков изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.ui" line="66"/> + <source>Select the change lists to limit the commit</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -41364,122 +41459,122 @@ <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>Tag in repository</source> <translation>Создать тег в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="221"/> <source>&Tag in repository...</source> <translation>&Создать тег в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="225"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории тег для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="228"/> <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="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="235"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="239"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="242"/> <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"/> + <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="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>Revert all changes made to the local project</source> - <translation>Отменить все изменения в локальном проекте</translation> + <source>Command &options...</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="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="274"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="278"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="281"/> <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="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="288"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="292"/> <source>Switch the local copy to another tag/branch</source> <translation>Переключить локальную копию на другой тег/ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="295"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Переключиться</b><p>Переключить локальную копию на другой тег/ветвь.</p></translation> </message> @@ -41504,163 +41599,163 @@ <translation type="obsolete"><b>Разрешение конфликтов</b><p>Разрешает конфликты, возникшие при обновлении локальной копии с репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> <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="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> <source>Execute an arbitrary VCS command</source> <translation>Выполнить произвольную команду VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> <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="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> <source>List tags of the project</source> <translation>Список тегов текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> <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="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> <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="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents</source> <translation>Просмотреть содержимое репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> <source>List repository contents...</source> <translation>Просмотреть содержимое репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> <source>Lists the contents of the repository</source> <translation>Просмотреть содержимое репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> <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="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> <source>Set Property...</source> <translation>Установить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> <source>Set a property for the project files</source> <translation>Установить свойство файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> <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="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties</source> <translation>Список свойств</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> <source>List Properties...</source> <translation>Список свойств...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> <source>List properties of the project files</source> <translation>Список свойств файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> <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="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property</source> <translation>Удалить свойство</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> <source>Delete Property...</source> <translation>Удалить свойство...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> <source>Delete a property for the project files</source> <translation>Удалить свойство для файлов проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Удалить свойство</b> <p>Удаляет свойство для файлов проекта.</p></translation> @@ -41681,37 +41776,37 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <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="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate</source> <translation>Переместить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> <source>Relocate...</source> <translation>Переместить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> + <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="411"/> + <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="198"/> + <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> @@ -41731,22 +41826,22 @@ <translation><b>Показать разницу (URL)</b><p>Показывает разницу между репозиториями, заданными двумя URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> + <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="418"/> + <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="422"/> + <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="425"/> + <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> @@ -41766,45 +41861,60 @@ <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="447"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> + <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="438"/> + <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="287"/> + <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="287"/> + <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="290"/> + <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="293"/> + <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> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <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> </context> <context> <name>SvnPropDelDialog</name> @@ -42315,22 +42425,22 @@ <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="717"/> <source>Unlock</source> <translation>Освободить</translation> </message> @@ -42375,22 +42485,22 @@ <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="701"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="733"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="734"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="751"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> @@ -42532,17 +42642,17 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="623"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -42562,17 +42672,17 @@ <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="767"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Среди выбранных нет файлов не включенных в список изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="784"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="785"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -42647,7 +42757,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -42657,17 +42767,17 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="682"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="584"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="664"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="665"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished">Нет/не выбраны пропущенных элементы.</translation> </message> @@ -54789,17 +54899,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1474"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1606"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Зафиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>