--- a/i18n/eric5_ru.ts Sat Feb 26 14:28:21 2011 +0100 +++ b/i18n/eric5_ru.ts Sat Feb 26 18:14:12 2011 +0100 @@ -6644,12 +6644,12 @@ <translation>Файл изменён</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5044"/> + <location filename="QScintilla/Editor.py" line="5063"/> <source><br><b>Warning:</b> You will loose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5048"/> + <location filename="QScintilla/Editor.py" line="5067"/> <source>File changed</source> <translation>Файл изменён</translation> </message> @@ -6729,77 +6729,77 @@ <translation>Запретить точку останова</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4310"/> + <location filename="QScintilla/Editor.py" line="4316"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4790"/> + <location filename="QScintilla/Editor.py" line="4809"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4858"/> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4818"/> + <location filename="QScintilla/Editor.py" line="4837"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> - <source>Error loading macro</source> - <translation>Ошибка при загрузке макроса</translation> - </message> - <message> <location filename="QScintilla/Editor.py" line="4858"/> + <source>Error loading macro</source> + <translation>Ошибка при загрузке макроса</translation> + </message> + <message> + <location filename="QScintilla/Editor.py" line="4877"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Start Macro Recording</source> <translation>Начало записи макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4926"/> + <location filename="QScintilla/Editor.py" line="4945"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4448"/> + <location filename="QScintilla/Editor.py" line="4454"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> @@ -6849,7 +6849,7 @@ <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -6859,12 +6859,12 @@ <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4566"/> + <location filename="QScintilla/Editor.py" line="4584"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> @@ -6894,17 +6894,17 @@ <translation>Предыдущая невыполняемая строка</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4352"/> + <location filename="QScintilla/Editor.py" line="4358"/> <source>All lines have been covered.</source> <translation>Все строки выполняются.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4356"/> + <location filename="QScintilla/Editor.py" line="4362"/> <source>There is no coverage file available.</source> <translation>Нет файла с информацией по охвату.</translation> </message> @@ -6914,22 +6914,22 @@ <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4832"/> + <location filename="QScintilla/Editor.py" line="4851"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4839"/> + <location filename="QScintilla/Editor.py" line="4858"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Файл с макросами <b>{0}</b> повреждён</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4890"/> + <location filename="QScintilla/Editor.py" line="4909"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с макросами: <b>{0}</b></p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5244"/> + <location filename="QScintilla/Editor.py" line="5263"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -6974,82 +6974,82 @@ <translation>Нет языка</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5127"/> + <location filename="QScintilla/Editor.py" line="5146"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5262"/> + <location filename="QScintilla/Editor.py" line="5281"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5264"/> + <location filename="QScintilla/Editor.py" line="5283"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5266"/> + <location filename="QScintilla/Editor.py" line="5285"/> <source>Add files...</source> <translation>Добавить файлы...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5268"/> + <location filename="QScintilla/Editor.py" line="5287"/> <source>Add aliased file...</source> <translation>Добавить файл под другим именем...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5270"/> + <location filename="QScintilla/Editor.py" line="5289"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5291"/> + <location filename="QScintilla/Editor.py" line="5310"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5307"/> + <location filename="QScintilla/Editor.py" line="5326"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5334"/> + <location filename="QScintilla/Editor.py" line="5353"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5395"/> + <location filename="QScintilla/Editor.py" line="5414"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5424"/> + <location filename="QScintilla/Editor.py" line="5443"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5273"/> + <location filename="QScintilla/Editor.py" line="5292"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4901"/> + <location filename="QScintilla/Editor.py" line="4920"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> @@ -7104,12 +7104,12 @@ <translation>Не задан формат экспорта. Отмена...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Imports Diagram</source> <translation>Диаграмма импортов</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5412"/> + <location filename="QScintilla/Editor.py" line="5431"/> <source>Include imports from external modules?</source> <translation>Включать импорты из внешних модулей?</translation> </message> @@ -7189,7 +7189,7 @@ <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5656"/> + <location filename="QScintilla/Editor.py" line="5675"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> @@ -7199,12 +7199,12 @@ <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5658"/> + <location filename="QScintilla/Editor.py" line="5677"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5660"/> + <location filename="QScintilla/Editor.py" line="5679"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> @@ -7224,7 +7224,7 @@ <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="5039"/> + <location filename="QScintilla/Editor.py" line="5058"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric5. Reread it?</p></source> <translation><p>Файл <b>{0}</b> был изменён, будучи открытым в eric5. Обновить?</p></translation> </message> @@ -7249,12 +7249,12 @@ <translation>Очистить предупреждения</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>py3flakes Warning</source> <translation>py3flakes предупреждения</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4692"/> + <location filename="QScintilla/Editor.py" line="4710"/> <source>No py3flakes warning message available.</source> <translation>py3flakes предупреждений не найдено.</translation> </message> @@ -7264,17 +7264,17 @@ <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4875"/> + <location filename="QScintilla/Editor.py" line="4894"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Макро <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4735"/> + <location filename="QScintilla/Editor.py" line="4753"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="QScintilla/Editor.py" line="4741"/> + <location filename="QScintilla/Editor.py" line="4759"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -17434,7 +17434,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="211"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -17446,175 +17446,275 @@ <p>Этот диалог отображает статус выбранного файла проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="85"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="90"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="188"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="210"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="232"/> <source>Press to send the input to the hg process</source> <translation>Отправить данные процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="235"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="238"/> <source>Alt+S</source> <translation>Alt+О</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="245"/> <source>Enter data to be sent to the hg process</source> <translation>Задайте данные, которые будут посланы процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="252"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="255"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="258"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="45"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="43"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="46"/> <source>Press to refresh the status display</source> <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="60"/> - <source>Add to repository</source> - <translation>Добавить в репозиторий</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Add to repository</source> + <translation>Добавить в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="75"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> <source>modified</source> <translation>изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>removed</source> <translation>удалено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>not tracked</source> <translation>не отслеживается</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>ignored</source> <translation>игнорировано</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="218"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="528"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Remove from repository</source> <translation>Удалить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="549"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="586"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="100"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="103"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="117"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="120"/> + <source>&Add</source> + <translation type="unfinished">&Добавить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="130"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <source>Revert the selected entries to the last revision in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="140"/> + <source>Re&vert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <source>Forget about the selected missing entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="150"/> + <source>For&get</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <source>Restore the selected missing entries from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="160"/> + <source>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="413"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Difference</source> + <translation type="obsolete">Различие</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="603"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="501"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -34358,336 +34458,431 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="157"/> <source>normal</source> <translation>Нормальный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="145"/> <source>added</source> <translation>Добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="134"/> - <source>deleted</source> - <translation>Удалено</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="146"/> + <source>deleted</source> + <translation>Удалено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="158"/> <source>modified</source> <translation>Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="159"/> <source>conflict</source> <translation>Конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="152"/> <source>unversioned</source> <translation>нет версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="153"/> <source>missing</source> <translation>Отсутствует</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="154"/> <source>type error</source> <translation>ошибка типа</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="155"/> <source>no</source> <translation>нет</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="144"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="156"/> <source>yes</source> <translation>да</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="150"/> <source>external</source> <translation>внешний</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="151"/> <source>ignored</source> <translation>игнорированный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="270"/> <source>Subversion Status</source> <translation>Статус Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="697"/> <source>Unlock</source> <translation>Освободить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="102"/> <source>Break lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="97"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="105"/> <source>Steal lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="149"/> <source>locked</source> <translation>захвачено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="150"/> <source>other lock</source> <translation>другой захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="151"/> <source>stolen lock</source> <translation>захват украден</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="152"/> <source>broken lock</source> <translation>захват нарушен</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="148"/> <source>not locked</source> <translation>не захвачено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="148"/> <source>replaced</source> <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="681"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="546"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="714"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="731"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="16"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="17"/> <source><b>Subversion Status</b> <p>This dialog shows the status of the selected file or project.</p></source> <translation><b>Статус Subversion</b> <p>Этот диалог отображает статус выбранного файла проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="53"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="58"/> - <source>Prop. Status</source> - <translation>Проп. статус</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="63"/> - <source>Locked</source> - <translation>Захвачено</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="68"/> - <source>History</source> - <translation>История</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="73"/> - <source>Switched</source> - <translation>Перекл</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="78"/> - <source>Lock Info</source> - <translation>Информ. о захвате</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="83"/> - <source>Up to date</source> - <translation>Новейший</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> - <source>Revision</source> - <translation>Версия (ревизия)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="93"/> - <source>Last Change</source> - <translation>Посл. изм</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="98"/> - <source>Author</source> - <translation>Автор</translation> + <source>Prop. Status</source> + <translation>Проп. статус</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="103"/> + <source>Locked</source> + <translation>Захвачено</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="108"/> + <source>History</source> + <translation>История</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="113"/> + <source>Switched</source> + <translation>Перекл</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="118"/> + <source>Lock Info</source> + <translation>Информ. о захвате</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="123"/> + <source>Up to date</source> + <translation>Новейший</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="128"/> + <source>Revision</source> + <translation>Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="133"/> + <source>Last Change</source> + <translation>Посл. изм</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="138"/> + <source>Author</source> + <translation>Автор</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="143"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="231"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="136"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="250"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="158"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="272"/> <source>Press to send the input to the subversion process</source> <translation>Отправить данные процессу subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="161"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="275"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="164"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="278"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="171"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="285"/> <source>Enter data to be sent to the subversion process</source> <translation>Задайте данные, которые будут посланы процессу subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="178"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="292"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="181"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="295"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="298"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="57"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="60"/> <source>Press to refresh the status display</source> <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="109"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="58"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="81"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="85"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="603"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="366"/> <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/SvnStatusDialog.ui" line="48"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="88"/> <source>Changelist</source> <translation>Список изменений</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="91"/> + <source>Add to Changelist</source> + <translation>Добавить к списку изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="765"/> + <source>Remove from Changelist</source> + <translation>Удалить из списка изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="747"/> + <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="765"/> + <source>There are no files available/selected belonging to a changelist.</source> + <translation>Среди выбранных нет файлов включенных в список изменений.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="39"/> + <source>&Filter on Status:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="49"/> + <source>Select the status of entries to be shown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="153"/> + <source>Commit the selected changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="156"/> + <source>&Commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="170"/> + <source>Add the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="173"/> + <source>&Add</source> + <translation type="unfinished">&Добавить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="180"/> + <source>Show differences of the selected entries to the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="183"/> + <source>&Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.ui" line="190"/> + <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>&Restore</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="83"/> - <source>Add to Changelist</source> - <translation>Добавить к списку изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="597"/> - <source>Remove from Changelist</source> - <translation>Удалить из списка изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="579"/> - <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="597"/> - <source>There are no files available/selected belonging to a changelist.</source> - <translation>Среди выбранных нет файлов включенных в список изменений.</translation> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="87"/> + <source>Restore missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="495"/> + <source>all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Difference</source> + <translation type="obsolete">Различие</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="662"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="576"/> + <source>There are no entries selected to be committed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="645"/> + <source>There are no missing entries available/selected.</source> + <translation type="unfinished">Нет/не выбраны пропущенных элементы.</translation> </message> </context> <context> @@ -35661,7 +35856,7 @@ <translation>Отображает прогресс проверки синтаксиса</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="44"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="45"/> <source>Show</source> <translation>Показать</translation> </message> @@ -35676,12 +35871,12 @@ <translation>Сообщение</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="46"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="47"/> <source>Press to show all files containing an issue</source> <translation>Показать все файлы, содержащие синтаксические ошибки</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="269"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="272"/> <source>No issues found.</source> <translation>Синтаксисические ошибки не найдены.</translation> </message> @@ -35711,7 +35906,7 @@ <translation>Начать</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="188"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="191"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -40867,12 +41062,12 @@ <tr><td>%%</td><td>знак процента</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1132"/> + <location filename="Utilities/__init__.py" line="1138"/> <source>Python2 interpreter not configured.</source> <translation>Интерпретатор Python2 не настроен.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1177"/> + <location filename="Utilities/__init__.py" line="1184"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation> </message>