--- a/i18n/eric5_ru.ts Mon Aug 05 13:17:51 2013 +0200 +++ b/i18n/eric5_ru.ts Mon Aug 05 15:58:30 2013 +0200 @@ -18624,42 +18624,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="228"/> <source>The hg process finished with the exit code {0}</source> <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1673"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="259"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="350"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -18669,32 +18669,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="610"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="674"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="739"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1442"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -18709,282 +18709,282 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1818"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="937"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1246"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2137"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2337"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2532"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2294"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2405"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2589"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2569"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2614"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2609"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Committing changes to Mercurial repository</source> <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3048"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2683"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="440"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="932"/> <source>Do you really want to revert all changes of the project?</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2894"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1742"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -46304,223 +46304,223 @@ <context> <name>Subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="288"/> <source>Importing project into Subversion repository</source> <translation>Импорт проекта в репозиторий Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="338"/> <source>Subversion Checkout</source> <translation>Закрузка из Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <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="358"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="359"/> <source>Checking project out of Subversion repository</source> <translation>Загрузка проекта из репозитория Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="400"/> <source>Subversion Export</source> <translation>Экспорт из Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="420"/> <source>Exporting project from Subversion repository</source> <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="997"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="999"/> <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="1022"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1024"/> <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="1057"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1059"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1130"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1132"/> <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="1155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1157"/> <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="1177"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1179"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1280"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1282"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1559"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1598"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1745"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1747"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="891"/> <source>Moving {0}</source> <translation>Перемещение {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1814"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1816"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1848"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1850"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1866"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1868"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1688"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1690"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="537"/> <source>Commiting changes to Subversion repository</source> <translation>Фиксация изменений в репозитории Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="593"/> <source>Synchronizing with the Subversion repository</source> <translation>Синхронизация с репозиторием Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="693"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="694"/> <source>Adding files/directories to the Subversion repository</source> <translation>Добавляю файлы/каталоги в репозиторий Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="792"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="793"/> <source>Adding directory trees to the Subversion repository</source> <translation>Добавляю деревья каталогов в репозиторий Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="828"/> <source>Removing files/directories from the Subversion repository</source> <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1105"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1707"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <source>Create project in repository</source> <translation>Создать проект в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="196"/> <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="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> <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="930"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="932"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2039"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2144"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2182"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="561"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="562"/> <source>Committed revision {0}.</source> <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1186"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1830"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1832"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1881"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1883"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/> - <source>Subversion Lock</source> - <translation>Запереть</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2019"/> - <source>Enter lock comment</source> - <translation>Задайте комментарий</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/> + <source>Subversion Lock</source> + <translation>Запереть</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2124"/> + <source>Enter lock comment</source> + <translation>Задайте комментарий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2229"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -46675,48 +46675,48 @@ <translation>нет версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="304"/> <source>Imported revision {0}. </source> <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="170"/> <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="172"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1869"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2150"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2255"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2175"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2280"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2212"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2317"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2306"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -46736,30 +46736,50 @@ <translation>Список изменений перемещён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/> <source>Commit Changes</source> <translation type="unfinished">Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="495"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1089"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1869"/> + <source>The hg process did not finish within 30s.</source> + <translation type="obsolete">Процесс hg не завершился в течение 30 секунд.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1871"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/> + <source>Subversion Side-by-Side Difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2090"/> + <source><p>The file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> + </message> </context> <context> <name>SubversionPage</name> @@ -47669,12 +47689,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="559"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="556"/> <source>Author</source> <translation>Автор</translation> </message> @@ -47684,7 +47704,7 @@ <translation>Дата</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="56"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -47744,83 +47764,83 @@ <translation>&Сравнить версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="86"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="87"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="434"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="295"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="301"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды <tt>cvn log</tt>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="307"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="317"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> <source>Press to send the input to the subversion process</source> <translation>Отправить данные процессу subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="332"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="335"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Задайте данные, которые будут посланы процессу subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="345"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="352"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Задайте данные, которые будут посланы процессу subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="359"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="362"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="365"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="245"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -47865,35 +47885,45 @@ <translation>Стоп при копировании/перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="88"/> <source>Replaced</source> <translation>Заменено</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="277"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="280"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLogDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="55"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="55"/> - <source>Deleted</source> - <translation>Удалено</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="56"/> + <source>Deleted</source> + <translation>Удалено</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="57"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="60"/> <source>revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="137"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="140"/> <source>diff to {0}</source> <translation>сравнить с {0}</translation> </message> @@ -47915,90 +47945,100 @@ щелкнув по ссылке.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="58"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="64"/> <source><b>Subversion log errors</b><p>This shows possible error messages of the svn log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды <tt>cvn log</tt>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="80"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="102"/> <source>Press to send the input to the subversion process</source> <translation>Отправить данные процессу subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="95"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="98"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="105"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Задайте данные, которые будут посланы процессу subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="112"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="108"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="115"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Задайте данные, которые будут посланы процессу subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="122"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="125"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.ui" line="128"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/> <source><i>author: {0}</i><br /> </source> <translation><i>автор: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="151"/> <source><i>date: {0}</i><br /> </source> <translation><i>дата: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="168"/> <source> (copied from {0}, revision {1})</source> <translation> (скопировано с {0}, ревизии {1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py" line="49"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py" line="130"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="42"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.ui" line="45"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnLoginDialog</name> @@ -48341,27 +48381,27 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Загрузить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="357"/> <source>Add tree to repository</source> <translation>Добавить дерево в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> @@ -48376,32 +48416,32 @@ <translation type="obsolete">Переместить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> - <source>Show status</source> - <translation>Показать статус</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> - <source>Show difference</source> - <translation>Показать различие</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> + <source>Show status</source> + <translation>Показать статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> + <source>Show difference</source> + <translation>Показать различие</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Слияние изменений</translation> </message> @@ -48411,37 +48451,37 @@ <translation type="obsolete">Разрешить конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Установить свойство</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> - <source>List Properties</source> - <translation>Список свойств</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> - <source>Delete Property</source> - <translation>Удалить свойство</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> - <source>Select all local file entries</source> - <translation>Выделить все локальные файлы</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> - <source>Select all versioned file entries</source> - <translation>Выделить все файлы с версиями (VCS)</translation> + <source>List Properties</source> + <translation>Список свойств</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> + <source>Delete Property</source> + <translation>Удалить свойство</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> + <source>Select all local file entries</source> + <translation>Выделить все локальные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> + <source>Select all versioned file entries</source> + <translation>Выделить все файлы с версиями (VCS)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> @@ -48451,80 +48491,90 @@ <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Unlock</source> <translation>Освободить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="404"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="275"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> + <source>Show repository info</source> + <translation>Показать информацию о репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> + <source>Show difference (URLs)</source> + <translation>Показать разницу (URL)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> - <source>Show repository info</source> - <translation>Показать информацию о репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> - <source>Show difference (URLs)</source> - <translation>Показать разницу (URL)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Conflict resolved</source> <translation>Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="503"/> <source>Move</source> <translation>Переместить</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="260"/> + <source>Show difference side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="267"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -49493,107 +49543,107 @@ <context> <name>SvnRevisionSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="13"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="14"/> <source>Subversion Diff</source> <translation>Subversion - изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="243"/> <source>Enter a revision number</source> <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="22"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="23"/> <source>Revision &1</source> <translation>Ревизия &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="178"/> <source>Select revision before last commit</source> <translation>Выбрать ревизию перед последней фиксацией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="181"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="188"/> <source>Select last committed revision</source> <translation>Последняя зафиксированная ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="191"/> <source>COMMITTED</source> <translation>COMMITTED</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="198"/> <source>Select base revision</source> <translation>Базовая ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="201"/> <source>BASE</source> <translation>BASE</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="208"/> <source>Select head revision of repository</source> <translation>Головная ревизия репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="211"/> <source>HEAD</source> <translation>HEAD</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="221"/> <source>Select working revision</source> <translation>Рабочая ревизия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="224"/> <source>WORKING</source> <translation>WORKING</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="255"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="262"/> <source>Enter time of revision</source> <translation>Задайте время ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="272"/> <source>Enter date of revision</source> <translation>Задайте дату ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="275"/> <source>yyyy-MM-dd</source> <translation>yyyy-MM-dd</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="298"/> <source>Select to specify a revision by number</source> <translation>Задать ревизию порядковым номером</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="294"/> - <source>Number</source> - <translation>Номер</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="301"/> + <source>Number</source> + <translation>Номер</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="308"/> <source>Select to specify a revision by date and time</source> <translation>Задать ревизию датой и временем</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="311"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.ui" line="172"/> <source>Revision &2</source> <translation>Ревизия &2</translation> </message> @@ -49601,67 +49651,67 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> <source>normal</source> <translation>Нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="164"/> <source>modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="165"/> <source>conflict</source> <translation>Конфликт</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> + <source>unversioned</source> + <translation>нет версий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> + <source>missing</source> + <translation>Отсутствует</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="160"/> + <source>type error</source> + <translation>ошибка типа</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="163"/> + <source>no</source> + <translation>нет</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="164"/> + <source>yes</source> + <translation>да</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="156"/> - <source>unversioned</source> - <translation>нет версий</translation> + <source>external</source> + <translation>внешний</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> - <source>missing</source> - <translation>Отсутствует</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> - <source>type error</source> - <translation>ошибка типа</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="161"/> - <source>no</source> - <translation>нет</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="162"/> - <source>yes</source> - <translation>да</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> - <source>external</source> - <translation>внешний</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="155"/> <source>ignored</source> <translation>игнорированный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="278"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="281"/> <source>Subversion Status</source> <translation>Статус Subversion</translation> </message> @@ -49671,82 +49721,82 @@ <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="716"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="753"/> <source>Unlock</source> <translation>Освободить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="108"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="110"/> <source>Break lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="113"/> <source>Steal lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> <source>locked</source> <translation>захвачено</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> + <source>other lock</source> + <translation>другой захват</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="159"/> + <source>stolen lock</source> + <translation>захват украден</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="160"/> + <source>broken lock</source> + <translation>захват нарушен</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> - <source>other lock</source> - <translation>другой захват</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="157"/> - <source>stolen lock</source> - <translation>захват украден</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="158"/> - <source>broken lock</source> - <translation>захват нарушен</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="154"/> <source>not locked</source> <translation>не захвачено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>replaced</source> <translation>заменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="737"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="770"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="787"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> @@ -49813,47 +49863,47 @@ <translation>Путь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="241"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="257"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="279"/> <source>Press to send the input to the subversion process</source> <translation>Отправить данные процессу subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="282"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Задайте данные, которые будут посланы процессу subversion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="289"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Задайте данные, которые будут посланы процессу subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="299"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="302"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="305"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -49863,12 +49913,12 @@ <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="117"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -49883,27 +49933,27 @@ <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="635"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="392"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -49913,22 +49963,22 @@ <translation>Список изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="99"/> <source>Add to Changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="803"/> <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="789"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="821"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -49973,22 +50023,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> <source>Revert the selected entries to the last revision in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> - <source>Re&vert</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="200"/> - <source>Restore the selected missing entries from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="203"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="210"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="213"/> <source>&Restore</source> <translation type="unfinished"></translation> </message> @@ -49998,12 +50048,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="95"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="508"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -50013,17 +50063,17 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="696"/> <source>Differences</source> <translation type="unfinished">Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="585"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="596"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="679"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -50037,6 +50087,31 @@ <source>Deselect all from commit</source> <translation>Снять выделение</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <source>Show differences of the selected entry to the repository in a side-by-side manner</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="193"/> + <source>Side-b&y-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/> + <source>Side-by-Side Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="722"/> + <source>Only one file with uncommitted changes must be selected.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnStatusMonitorThread</name> @@ -63111,17 +63186,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1951"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -63132,30 +63207,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1307"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1323"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -63182,12 +63257,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1357"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -63442,17 +63517,17 @@ <context> <name>subversion</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1639"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1641"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1513"/> <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="1640"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1642"/> <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>